diff --git a/app/views/aspects/_aspect_stream.haml b/app/views/aspects/_aspect_stream.haml index d7559ddf6..0e9375c67 100644 --- a/app/views/aspects/_aspect_stream.haml +++ b/app/views/aspects/_aspect_stream.haml @@ -6,7 +6,7 @@ = stream.title - if current_user.beta? - = link_to "Make something", "#composer", :rel => "facebox", :class => "button primary", :style => "display: block; margin: 20px 10px; margin-bottom: 30px; padding: 10px; text-align:center; font-weight: bold;" + = link_to t('.make_something'), "#composer", :rel => "facebox", :class => "button primary", :style => "display: block; margin: 20px 10px; margin-bottom: 30px; padding: 10px; text-align:center; font-weight: bold;" #composer{:style => "display:none;"} %iframe{:src => '/posts/new', :height => 500, :width => 980, :style => "border:none;"} @@ -24,4 +24,4 @@ %span.loader.hidden - if current_user.contacts.size < 2 - = render 'aspects/no_contacts_message' \ No newline at end of file + = render 'aspects/no_contacts_message' diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb index c6ec8f529..a32dc4d77 100644 --- a/app/views/sessions/new.html.erb +++ b/app/views/sessions/new.html.erb @@ -11,7 +11,7 @@
@@ -21,7 +21,7 @@
@@ -30,7 +30,7 @@
- <%= f.submit "Sign In", :class => "new-btn" %> + <%= f.submit t('devise.sessions.new.sign_in'), :class => "new-btn" %> <% end %> <% if display_password_reset_link? %> @@ -44,4 +44,4 @@
<%= link_to t('devise.shared.links.sign_up'), new_registration_path(resource_name) %> <% end %> - \ No newline at end of file + diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index b36aab3d2..af1007bec 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -262,6 +262,7 @@ en: aspect_stream: stay_updated: "Stay Updated" stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and posts from some creative members of the community." + make_something: "Make something" aspect_memberships: destroy: