Internationalization improvements across multiple pagesch-internationalization

5 files changed, 43 insertions, 13 deletions

diff --git a/app/assets/javascripts/awards_handler.js b/app/assets/javascripts/awards_handler.js
index aaab217964c..8c9f71b3f3a 100644
--- a/app/assets/javascripts/awards_handler.js
+++ b/app/assets/javascripts/awards_handler.js
@@ -21,14 +21,14 @@ const requestAnimationFrame =
 const FROM_SENTENCE_REGEX = /(?:, and | and |, )/; // For separating lists produced by ruby's Array#toSentence
 
 const categoryLabelMap = {
-  activity: 'Activity',
-  people: 'People',
-  nature: 'Nature',
-  food: 'Food',
-  travel: 'Travel',
-  objects: 'Objects',
-  symbols: 'Symbols',
-  flags: 'Flags',
+  activity: __('Activity'),
+  people: __('People'),
+  nature: __('Nature'),
+  food: __('Food'),
+  travel: __('Travel'),
+  objects: __('Objects'),
+  symbols: __('Symbols'),
+  flags: __('Flags'),
 };
 
 const IS_VISIBLE = 'is-visible';
@@ -154,7 +154,7 @@ export class AwardsHandler {
     const frequentlyUsedEmojis = this.getFrequentlyUsedEmojis();
     let frequentlyUsedCatgegory = '';
     if (frequentlyUsedEmojis.length > 0) {
-      frequentlyUsedCatgegory = this.renderCategory('Frequently used', frequentlyUsedEmojis, {
+      frequentlyUsedCatgegory = this.renderCategory(__('Frequently used'), frequentlyUsedEmojis, {
         menuListClass: 'frequent-emojis',
       });
     }
diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb
index e2e007eee50..04e6ab15b26 100644
--- a/app/helpers/issuables_helper.rb
+++ b/app/helpers/issuables_helper.rb
@@ -226,10 +226,13 @@ module IssuablesHelper
 
   def issuables_state_counter_text(issuable_type, state, display_count)
     titles = {
-      opened: "Open"
+      opened: _("Open"),
+      closed: _("Closed"),
+      merged: _("Merged"),
+      all: _("All")
     }
 
-    state_title = titles[state] || state.to_s.humanize
+    state_title = titles[state]
     html = content_tag(:span, state_title)
 
     if display_count
diff --git a/app/views/projects/merge_requests/_mr_title.html.haml b/app/views/projects/merge_requests/_mr_title.html.haml
index 92e34b3ceda..033bc61fa07 100644
--- a/app/views/projects/merge_requests/_mr_title.html.haml
+++ b/app/views/projects/merge_requests/_mr_title.html.haml
@@ -39,6 +39,6 @@
               = link_to 'Reopen', merge_request_path(@merge_request, merge_request: { state_event: :reopen }), method: :put, class: 'reopen-mr-link', title: 'Reopen merge request'
 
       - if can_update_merge_request
-        = link_to 'Edit', edit_project_merge_request_path(@project, @merge_request), class: "d-none d-sm-none d-md-block btn btn-grouped js-issuable-edit qa-edit-button"
+        = link_to _('Edit'), edit_project_merge_request_path(@project, @merge_request), class: "d-none d-sm-none d-md-block btn btn-grouped js-issuable-edit qa-edit-button"
 
       = render 'shared/issuable/close_reopen_button', issuable: @merge_request, can_update: can_update_merge_request, can_reopen: can_reopen_merge_request
diff --git a/app/views/shared/projects/_search_form.html.haml b/app/views/shared/projects/_search_form.html.haml
index 4365e3f6877..6b025da5de6 100644
--- a/app/views/shared/projects/_search_form.html.haml
+++ b/app/views/shared/projects/_search_form.html.haml
@@ -1,5 +1,5 @@
 - form_field_classes = local_assigns[:admin_view] || !Feature.enabled?(:project_list_filter_bar) ? 'input-short js-projects-list-filter' : ''
-- placeholder = local_assigns[:search_form_placeholder] ? search_form_placeholder : 'Filter by name...'
+- placeholder = local_assigns[:search_form_placeholder] ? search_form_placeholder : _('Filter by name...')
 
 = form_tag filter_projects_path, method: :get, class: 'project-filter-form qa-project-filter-form', id: 'project-filter-form' do |f|
   = search_field_tag :name, params[:name],
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 7b742660a4c..f95f2231d71 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -4707,6 +4707,9 @@ msgstr ""
 msgid "Filter by milestone name"
 msgstr ""
 
+msgid "Filter by name..."
+msgstr ""
+
 msgid "Filter by two-factor authentication"
 msgstr ""
 
@@ -4752,6 +4755,9 @@ msgstr ""
 msgid "First day of the week"
 msgstr ""
 
+msgid "Flags"
+msgstr ""
+
 msgid "FlowdockService|Flowdock Git source token"
 msgstr ""
 
@@ -4779,6 +4785,9 @@ msgstr ""
 msgid "Font Color"
 msgstr ""
 
+msgid "Food"
+msgstr ""
+
 msgid "Footer message"
 msgstr ""
 
@@ -4827,6 +4836,9 @@ msgstr ""
 msgid "Found errors in your .gitlab-ci.yml:"
 msgstr ""
 
+msgid "Frequently used"
+msgstr ""
+
 msgid "Friday"
 msgstr ""
 
@@ -6729,6 +6741,9 @@ msgstr ""
 msgid "Naming, visibility"
 msgstr ""
 
+msgid "Nature"
+msgstr ""
+
 msgid "Nav|Help"
 msgstr ""
 
@@ -7139,6 +7154,9 @@ msgstr ""
 msgid "Object does not exist on the server or you don't have permissions to access it"
 msgstr ""
 
+msgid "Objects"
+msgstr ""
+
 msgid "Oct"
 msgstr ""
 
@@ -7366,6 +7384,9 @@ msgstr ""
 msgid "Pending"
 msgstr ""
 
+msgid "People"
+msgstr ""
+
 msgid "People without permission will never get a notification and won't be able to comment."
 msgstr ""
 
@@ -10288,6 +10309,9 @@ msgstr ""
 msgid "Switch to the source to copy it to the clipboard"
 msgstr ""
 
+msgid "Symbols"
+msgstr ""
+
 msgid "System Hooks"
 msgstr ""
 
@@ -11446,6 +11470,9 @@ msgstr ""
 msgid "TransferProject|Transfer failed, please contact an admin."
 msgstr ""
 
+msgid "Travel"
+msgstr ""
+
 msgid "Tree view"
 msgstr ""