diff --git a/app/assets/javascripts/application/i18n/translations.js b/app/assets/javascripts/application/i18n/translations.js deleted file mode 100644 index 203d59a497..0000000000 --- a/app/assets/javascripts/application/i18n/translations.js +++ /dev/null @@ -1,3 +0,0 @@ -I18n.translations || (I18n.translations = {}); -I18n.translations["en"] = I18n.extend((I18n.translations["en"] || {}), {"js":{"dashboard":{"all_updates":"All updates","none":"None","selected_updates":"Selected updates"}}}); -I18n.translations["de"] = I18n.extend((I18n.translations["de"] || {}), {"js":{"dashboard":{"all_updates":"Alle updates","none":"Keiner","selected_updates":"Ausgewählte Updates"}}}); diff --git a/app/views/features/new.html.erb b/app/views/features/new.html.erb index a4a05df2cb..7d6c2169e2 100644 --- a/app/views/features/new.html.erb +++ b/app/views/features/new.html.erb @@ -1,8 +1,11 @@

New Feature

+ + +
<% url = { :controller => "features", :action => "create", :id => params[:id] } %> -<%= form_for :revision, :as => :revision, :url => url, :html => {:class => "form card bg-light card-body"} do |f| %> +<%= form_for :revision, :as => :revision, :url => url, :html => {:class => "form"} do |f| %> <% if f.error_messages != "" %>
<%= f.error_messages :header_message => "Your note couldn't be saved." %>
<% end %> diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 48b2826a7a..3a92f1a574 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -1,4 +1,4 @@ - <% cache('feature_anniversary-banner', skip_digest: true) do %> +<% cache('feature_anniversary-banner', skip_digest: true) do %> <%= feature('anniversary-banner') %> <% end %> @@ -25,23 +25,40 @@
+ +
+ <%= t('layout._header.store') %> + <%= t('layout._header.donate') %> + + <% if current_user %> + Dashboard + <% else %> + <%= t('layout._header.join') %> + <% end %> +
diff --git a/config/i18n-js.yml b/config/i18n-js.yml index 9b0ddae384..17c8f9a910 100644 --- a/config/i18n-js.yml +++ b/config/i18n-js.yml @@ -1,3 +1,2 @@ translations: - file: "app/assets/javascripts/application/i18n/translations.js" - only: '*.js.*' \ No newline at end of file diff --git a/config/locales/en.yml b/config/locales/en.yml index 298f39870b..d3ae87f76f 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -561,7 +561,7 @@ en: board: "Non-profit board" fund: "How we're funded" press_and_media: "Press and Media" - contact: "Contact the staff" + contact: "Contact" get_involved: get_involved_title: "Get Involved" getting_started: "Getting started"