Port translations from CE to EE

app/assets/javascripts/lib/utils/datetime_utility.js

@@ -3,6 +3,11 @@
 import timeago from 'timeago.js';
 import dateFormat from 'vendor/date.format';
 
+import {
+  lang,
+  s__,
+} from '../../locale';
+
 window.timeago = timeago;
 window.dateFormat = dateFormat;
 
@@ -48,26 +53,45 @@ window.dateFormat = dateFormat;
       var locale;
 
       if (!timeagoInstance) {
+        const localeRemaining = function(number, index) {
+          return [
+            [s__('Timeago|less than a minute ago'), s__('Timeago|a while')],
+            [s__('Timeago|less than a minute ago'), s__('Timeago|%s seconds remaining')],
+            [s__('Timeago|about a minute ago'), s__('Timeago|1 minute remaining')],
+            [s__('Timeago|%s minutes ago'), s__('Timeago|%s minutes remaining')],
+            [s__('Timeago|about an hour ago'), s__('Timeago|1 hour remaining')],
+            [s__('Timeago|about %s hours ago'), s__('Timeago|%s hours remaining')],
+            [s__('Timeago|a day ago'), s__('Timeago|1 day remaining')],
+            [s__('Timeago|%s days ago'), s__('Timeago|%s days remaining')],
+            [s__('Timeago|a week ago'), s__('Timeago|1 week remaining')],
+            [s__('Timeago|%s weeks ago'), s__('Timeago|%s weeks remaining')],
+            [s__('Timeago|a month ago'), s__('Timeago|1 month remaining')],
+            [s__('Timeago|%s months ago'), s__('Timeago|%s months remaining')],
+            [s__('Timeago|a year ago'), s__('Timeago|1 year remaining')],
+            [s__('Timeago|%s years ago'), s__('Timeago|%s years remaining')]
+          ][index];
+        };
         locale = function(number, index) {
           return [
-            ['less than a minute ago', 'a while'],
-            ['less than a minute ago', 'in %s seconds'],
-            ['about a minute ago', 'in 1 minute'],
-            ['%s minutes ago', 'in %s minutes'],
-            ['about an hour ago', 'in 1 hour'],
-            ['about %s hours ago', 'in %s hours'],
-            ['a day ago', 'in 1 day'],
-            ['%s days ago', 'in %s days'],
-            ['a week ago', 'in 1 week'],
-            ['%s weeks ago', 'in %s weeks'],
-            ['a month ago', 'in 1 month'],
-            ['%s months ago', 'in %s months'],
-            ['a year ago', 'in 1 year'],
-            ['%s years ago', 'in %s years']
+            [s__('Timeago|less than a minute ago'), s__('Timeago|a while')],
+            [s__('Timeago|less than a minute ago'), s__('Timeago|in %s seconds')],
+            [s__('Timeago|about a minute ago'), s__('Timeago|in 1 minute')],
+            [s__('Timeago|%s minutes ago'), s__('Timeago|in %s minutes')],
+            [s__('Timeago|about an hour ago'), s__('Timeago|in 1 hour')],
+            [s__('Timeago|about %s hours ago'), s__('Timeago|in %s hours')],
+            [s__('Timeago|a day ago'), s__('Timeago|in 1 day')],
+            [s__('Timeago|%s days ago'), s__('Timeago|in %s days')],
+            [s__('Timeago|a week ago'), s__('Timeago|in 1 week')],
+            [s__('Timeago|%s weeks ago'), s__('Timeago|in %s weeks')],
+            [s__('Timeago|a month ago'), s__('Timeago|in 1 month')],
+            [s__('Timeago|%s months ago'), s__('Timeago|in %s months')],
+            [s__('Timeago|a year ago'), s__('Timeago|in 1 year')],
+            [s__('Timeago|%s years ago'), s__('Timeago|in %s years')]
           ][index];
         };
 
-        timeago.register('gl_en', locale);
+        timeago.register(lang, locale);
+        timeago.register(`${lang}-remaining`, localeRemaining);
         timeagoInstance = timeago();
       }
 
@@ -79,13 +103,11 @@ window.dateFormat = dateFormat;
       if (!time) {
         return '';
       }
-      suffix || (suffix = 'remaining');
-      expiredLabel || (expiredLabel = 'Past due');
-      timefor = gl.utils.getTimeago().format(time).replace('in', '');
-      if (timefor.indexOf('ago') > -1) {
+      if (new Date(time) < new Date()) {
+        expiredLabel || (expiredLabel = s__('Timeago|Past due'));
         timefor = expiredLabel;
       } else {
-        timefor = timefor.trim() + ' ' + suffix;
+        timefor = gl.utils.getTimeago().format(time, `${lang}-remaining`).trim();
       }
       return timefor;
     };
@@ -102,7 +124,7 @@ window.dateFormat = dateFormat;
     };
 
     w.gl.utils.updateTimeagoText = function(el) {
-      const formattedDate = gl.utils.getTimeago().format(el.getAttribute('datetime'), 'gl_en');
+      const formattedDate = gl.utils.getTimeago().format(el.getAttribute('datetime'), lang);
 
       if (el.textContent !== formattedDate) {
         el.textContent = formattedDate;

app/controllers/projects_controller.rb

@@ -34,7 +34,7 @@ class ProjectsController < Projects::ApplicationController
 
       redirect_to(
         project_path(@project),
-        notice: "Project '#{@project.name}' was successfully created."
+        notice: _("Project '%{project_name}' was successfully created.") % { project_name: @project.name }
       )
     else
       render 'new'
@@ -49,7 +49,7 @@ class ProjectsController < Projects::ApplicationController
 
     respond_to do |format|
       if result[:status] == :success
-        flash[:notice] = "Project '#{@project.name}' was successfully updated."
+        flash[:notice] = _("Project '%{project_name}' was successfully updated.") % { project_name: @project.name }
         format.html do
           redirect_to(edit_project_path(@project))
         end
@@ -76,7 +76,7 @@ class ProjectsController < Projects::ApplicationController
     return access_denied! unless can?(current_user, :remove_fork_project, @project)
 
     if ::Projects::UnlinkForkService.new(@project, current_user).execute
-      flash[:notice] = 'The fork relationship has been removed.'
+      flash[:notice] = _('The fork relationship has been removed.')
     end
   end
 
@@ -98,7 +98,7 @@ class ProjectsController < Projects::ApplicationController
     end
 
     if @project.pending_delete?
-      flash[:alert] = "Project #{@project.name} queued for deletion."
+      flash[:alert] = _("Project '%{project_name}' queued for deletion.") % { project_name: @project.name }
     end
 
     respond_to do |format|
@@ -118,7 +118,7 @@ class ProjectsController < Projects::ApplicationController
     return access_denied! unless can?(current_user, :remove_project, @project)
 
     ::Projects::DestroyService.new(@project, current_user, {}).async_execute
-    flash[:alert] = "Project '#{@project.name_with_namespace}' will be deleted."
+    flash[:alert] = _("Project '%{project_name}' will be deleted.") % { project_name: @project.name_with_namespace }
 
     redirect_to dashboard_projects_path
   rescue Projects::DestroyService::DestroyError => ex
@@ -157,7 +157,7 @@ class ProjectsController < Projects::ApplicationController
 
     redirect_to(
       project_path(@project),
-      notice: "Housekeeping successfully started"
+      notice: _("Housekeeping successfully started")
     )
   rescue ::Projects::HousekeepingService::LeaseTaken => ex
     redirect_to(
@@ -171,7 +171,7 @@ class ProjectsController < Projects::ApplicationController
 
     redirect_to(
       edit_project_path(@project),
-      notice: "Project export started. A download link will be sent by email."
+      notice: _("Project export started. A download link will be sent by email.")
     )
   end
 
@@ -183,16 +183,16 @@ class ProjectsController < Projects::ApplicationController
     else
       redirect_to(
         edit_project_path(@project),
-        alert: "Project export link has expired. Please generate a new export from your project settings."
+        alert: _("Project export link has expired. Please generate a new export from your project settings.")
       )
     end
   end
 
   def remove_export
     if @project.remove_exports
-      flash[:notice] = "Project export has been deleted."
+      flash[:notice] = _("Project export has been deleted.")
     else
-      flash[:alert] = "Project export could not be deleted."
+      flash[:alert] = _("Project export could not be deleted.")
     end
     redirect_to(edit_project_path(@project))
   end
@@ -203,7 +203,7 @@ class ProjectsController < Projects::ApplicationController
     else
       redirect_to(
         edit_project_path(@project),
-        alert: "Project export could not be deleted."
+        alert: _("Project export could not be deleted.")
       )
     end
   end
@@ -221,13 +221,13 @@ class ProjectsController < Projects::ApplicationController
     branches = BranchesFinder.new(@repository, params).execute.map(&:name)
 
     options = {
-      'Branches' => branches.take(100)
+      s_('RefSwitcher|Branches') => branches.take(100)
     }
 
     unless @repository.tag_count.zero?
       tags = TagsFinder.new(@repository, params).execute.map(&:name)
 
-      options['Tags'] = tags.take(100)
+      options[s_('RefSwitcher|Tags')] = tags.take(100)
     end
 
     # If reference is commit id - we should add it to branch/tag selectbox

app/helpers/button_helper.rb

@@ -61,7 +61,7 @@ module ButtonHelper
         html: true,
         placement: placement,
         container: 'body',
-        title: "Set a password on your account<br>to pull or push via #{protocol}",
+        title: _("Set a password on your account to pull or push via %{protocol}") % { protocol: protocol },
         primary_url: (geo_primary_http_url_to_repo(project) if Gitlab::Geo.secondary?)
       }
   end
@@ -77,7 +77,7 @@ module ButtonHelper
         html: true,
         placement: placement,
         container: 'body',
-        title: 'Add an SSH key to your profile<br>to pull or push via SSH.'
+        title: _('Add an SSH key to your profile to pull or push via SSH.')
       }
   end
 

app/helpers/ci_status_helper.rb

@@ -16,7 +16,7 @@ module CiStatusHelper
       return status.label
     end
 
-    case status
+    label = case status
             when 'success'
               'passed'
             when 'success_with_warnings'
@@ -26,6 +26,8 @@ module CiStatusHelper
             else
               status
             end
+    translation = "CiStatusLabel|#{label}"
+    s_(translation)
   end
 
   def ci_text_for_status(status)
@@ -35,13 +37,22 @@ module CiStatusHelper
 
     case status
     when 'success'
-      'passed'
+      s_('CiStatusText|passed')
     when 'success_with_warnings'
-      'passed'
+      s_('CiStatusText|passed')
     when 'manual'
-      'blocked'
+      s_('CiStatusText|blocked')
     else
-      status
+      # All states are already being translated inside the detailed statuses:
+      # :running => Gitlab::Ci::Status::Running
+      # :skipped => Gitlab::Ci::Status::Skipped
+      # :failed => Gitlab::Ci::Status::Failed
+      # :success => Gitlab::Ci::Status::Success
+      # :canceled => Gitlab::Ci::Status::Canceled
+      # The following states are customized above:
+      # :manual => Gitlab::Ci::Status::Manual
+      status_translation = "CiStatusText|#{status}"
+      s_(status_translation)
     end
   end
 

app/helpers/notifications_helper.rb

@@ -21,30 +21,36 @@ module NotificationsHelper
   end
 
   def notification_title(level)
+    # Can be anything in `NotificationSetting.level:
     case level.to_sym
     when :participating
-      'Participate'
+      s_('NotificationLevel|Participate')
     when :mention
-      'On mention'
+      s_('NotificationLevel|On mention')
     else
-      level.to_s.titlecase
+      N_('NotificationLevel|Global')
+      N_('NotificationLevel|Watch')
+      N_('NotificationLevel|Disabled')
+      N_('NotificationLevel|Custom')
+      level = "NotificationLevel|#{level.to_s.humanize}"
+      s_(level)
     end
   end
 
   def notification_description(level)
     case level.to_sym
     when :participating
-      'You will only receive notifications for threads you have participated in'
+      _('You will only receive notifications for threads you have participated in')
     when :mention
-      'You will receive notifications only for comments in which you were @mentioned'
+      _('You will receive notifications only for comments in which you were @mentioned')
     when :watch
-      'You will receive notifications for any activity'
+      _('You will receive notifications for any activity')
     when :disabled
-      'You will not get any notifications via email'
+      _('You will not get any notifications via email')
     when :global
-      'Use your global notification setting'
+      _('Use your global notification setting')
     when :custom
-      'You will only receive notifications for the events you choose'
+      _('You will only receive notifications for the events you choose')
     end
   end
 
@@ -76,11 +82,22 @@ module NotificationsHelper
   end
 
   def notification_event_name(event)
+    # All values from NotificationSetting::EMAIL_EVENTS
     case event
     when :success_pipeline
-      'Successful pipeline'
+      s_('NotificationEvent|Successful pipeline')
     else
-      event.to_s.humanize
+      N_('NotificationEvent|New note')
+      N_('NotificationEvent|New issue')
+      N_('NotificationEvent|Reopen issue')
+      N_('NotificationEvent|Close issue')
+      N_('NotificationEvent|Reassign issue')
+      N_('NotificationEvent|New merge request')
+      N_('NotificationEvent|Close merge request')
+      N_('NotificationEvent|Reassign merge request')
+      N_('NotificationEvent|Merge merge request')
+      N_('NotificationEvent|Failed pipeline')
+      s_(event.to_s.humanize)
     end
   end
 end

app/helpers/projects_helper.rb

@@ -70,15 +70,18 @@ module ProjectsHelper
   end
 
   def remove_project_message(project)
-    "You are going to remove #{project.name_with_namespace}.\n Removed project CANNOT be restored!\n Are you ABSOLUTELY sure?"
+    _("You are going to remove %{project_name_with_namespace}.\nRemoved project CANNOT be restored!\nAre you ABSOLUTELY sure?") %
+      { project_name_with_namespace: project.name_with_namespace }
   end
 
   def transfer_project_message(project)
-    "You are going to transfer #{project.name_with_namespace} to another owner. Are you ABSOLUTELY sure?"
+    _("You are going to transfer %{project_name_with_namespace} to another owner. Are you ABSOLUTELY sure?") %
+      { project_name_with_namespace: project.name_with_namespace }
   end
 
   def remove_fork_project_message(project)
-    "You are going to remove the fork relationship to source project #{@project.forked_from_project.name_with_namespace}.  Are you ABSOLUTELY sure?"
+    _("You are going to remove the fork relationship to source project %{forked_from_project}.  Are you ABSOLUTELY sure?") %
+      { forked_from_project: @project.forked_from_project.name_with_namespace }
   end
 
   def project_nav_tabs
@@ -138,11 +141,15 @@ module ProjectsHelper
 
     if @project.private?
       level = @project.project_feature.send(field)
-      options.delete('Everyone with access')
-      highest_available_option = options.values.max if level == ProjectFeature::ENABLED
+      disabled_option = ProjectFeature::ENABLED
+      highest_available_option = ProjectFeature::PRIVATE if level == disabled_option
     end
 
-    options = options_for_select(options, selected: highest_available_option || @project.project_feature.public_send(field))
+    options = options_for_select(
+      options.invert,
+      selected: highest_available_option || @project.project_feature.public_send(field),
+      disabled: disabled_option
+    )
 
     content_tag(
       :select,
@@ -155,12 +162,13 @@ module ProjectsHelper
   end
 
   def link_to_autodeploy_doc
-    link_to 'About auto deploy', help_page_path('ci/autodeploy/index'), target: '_blank'
+    link_to _('About auto deploy'), help_page_path('ci/autodeploy/index'), target: '_blank'
   end
 
   def autodeploy_flash_notice(branch_name)
-    "Branch <strong>#{truncate(sanitize(branch_name))}</strong> was created. To set up auto deploy, \
-      choose a GitLab CI Yaml template and commit your changes. #{link_to_autodeploy_doc}".html_safe
+    translation = _("Branch <strong>%{branch_name}</strong> was created. To set up auto deploy, choose a GitLab CI Yaml template and commit your changes. %{link_to_autodeploy_doc}") %
+      { branch_name: truncate(sanitize(branch_name)), link_to_autodeploy_doc: link_to_autodeploy_doc }
+    translation.html_safe
   end
 
   def project_list_cache_key(project)
@@ -246,11 +254,11 @@ module ProjectsHelper
   def project_lfs_status(project)
     if project.lfs_enabled?
       content_tag(:span, class: 'lfs-enabled') do
-        'Enabled'
+        s_('LFSStatus|Enabled')
       end
     else
       content_tag(:span, class: 'lfs-disabled') do
-        'Disabled'
+        s_('LFSStatus|Disabled')
       end
     end
   end
@@ -269,7 +277,7 @@ module ProjectsHelper
     if current_user
       current_user.name
     else
-      "Your name"
+      _("Your name")
     end
   end
 
@@ -315,17 +323,18 @@ module ProjectsHelper
     if project.last_activity_at
       time_ago_with_tooltip(project.last_activity_at, placement: 'bottom', html_class: 'last_activity_time_ago')
     else
-      "Never"
+      s_("ProjectLastActivity|Never")
     end
   end
 
   def add_special_file_path(project, file_name:, commit_message: nil, branch_name: nil, context: nil)
+    commit_message ||= s_("CommitMessage|Add %{file_name}") % { file_name: file_name.downcase }
     namespace_project_new_blob_path(
       project.namespace,
       project,
       project.default_branch || 'master',
       file_name:      file_name,
-      commit_message: commit_message || "Add #{file_name.downcase}",
+      commit_message: commit_message,
       branch_name: branch_name,
       context: context
     )
@@ -476,9 +485,9 @@ module ProjectsHelper
 
   def project_feature_options
     {
-      'Disabled' => ProjectFeature::DISABLED,
-      'Only team members' => ProjectFeature::PRIVATE,
-      'Everyone with access' => ProjectFeature::ENABLED
+      ProjectFeature::DISABLED => s_('ProjectFeature|Disabled'),
+      ProjectFeature::PRIVATE => s_('ProjectFeature|Only team members'),
+      ProjectFeature::ENABLED => s_('ProjectFeature|Everyone with access')
     }
   end
 

app/helpers/visibility_level_helper.rb

@@ -29,11 +29,11 @@ module VisibilityLevelHelper
   def project_visibility_level_description(level)
     case level
     when Gitlab::VisibilityLevel::PRIVATE
-      "Project access must be granted explicitly to each user."
+      _("Project access must be granted explicitly to each user.")
     when Gitlab::VisibilityLevel::INTERNAL
-      "The project can be cloned by any logged in user."
+      _("The project can be accessed by any logged in user.")
     when Gitlab::VisibilityLevel::PUBLIC
-      "The project can be cloned without any authentication."
+      _("The project can be accessed without any authentication.")
     end
   end
 
@@ -81,7 +81,9 @@ module VisibilityLevelHelper
   end
 
   def visibility_level_label(level)
-    Project.visibility_levels.key(level)
+    # The visibility level can be:
+    # 'VisibilityLevel|Private', 'VisibilityLevel|Internal', 'VisibilityLevel|Public'
+    s_(Project.visibility_levels.key(level))
   end
 
   def restricted_visibility_levels(show_all = false)

app/views/layouts/_head.html.haml

@@ -33,6 +33,7 @@
 
   = webpack_bundle_tag "runtime"
   = webpack_bundle_tag "common"
+  = webpack_bundle_tag "locale"
   = webpack_bundle_tag "main"
   = webpack_bundle_tag "raven" if current_application_settings.clientside_sentry_enabled
   = webpack_bundle_tag "test" if Rails.env.test?

app/views/projects/_find_file_link.html.haml

 = link_to namespace_project_find_file_path(@project.namespace, @project, @ref), class: 'btn btn-grouped shortcuts-find-file', rel: 'nofollow' do
   = icon('search')
-  %span Find file
+  %span= _('Find file')

app/views/projects/_head.html.haml

@@ -4,17 +4,14 @@
     .nav-links.sub-nav.scrolling-tabs
       %ul{ class: container_class }
         = nav_link(path: 'projects#show') do
-          = link_to project_path(@project), title: 'Project home', class: 'shortcuts-project' do
-            %span
-              Home
+          = link_to project_path(@project), title: _('Project home'), class: 'shortcuts-project' do
+            %span= _('Home')
 
         = nav_link(path: 'projects#activity') do
-          = link_to activity_project_path(@project), title: 'Activity', class: 'shortcuts-project-activity' do
-            %span
-              Activity
+          = link_to activity_project_path(@project), title: _('Activity'), class: 'shortcuts-project-activity' do
+            %span= _('Activity')
 
         - if can?(current_user, :read_cycle_analytics, @project)
           = nav_link(path: 'cycle_analytics#show') do
-            = link_to project_cycle_analytics_path(@project), title: 'Cycle Analytics', class: 'shortcuts-project-cycle-analytics' do
-              %span
-                Cycle Analytics
+            = link_to project_cycle_analytics_path(@project), title: _('Cycle Analytics'), class: 'shortcuts-project-cycle-analytics' do
+              %span= _('Cycle Analytics')

app/views/projects/_home_panel.html.haml

@@ -14,7 +14,7 @@
 
       - if forked_from_project = @project.forked_from_project
         %p
-          Forked from
+          #{ s_('ForkedFromProjectPath|Forked from') }
           = link_to project_path(forked_from_project) do
             = forked_from_project.namespace.try(:name)
       - if @project.mirror?

app/views/projects/_last_push.html.haml

@@ -15,4 +15,4 @@
 
       .pull-right
         = link_to new_mr_path_from_push_event(event), title: "New merge request", class: "btn btn-info btn-sm" do
-          Create merge request
+          #{ _('Create merge request') }

app/views/projects/blob/_new_dir.html.haml

@@ -3,18 +3,18 @@
     .modal-content
       .modal-header
         %a.close{ href: "#", "data-dismiss" => "modal" } ×
-        %h3.page-title Create New Directory
+        %h3.page-title= _('Create New Directory')
       .modal-body
         = form_tag namespace_project_create_dir_path(@project.namespace, @project, @id), method: :post, remote: false, class: 'form-horizontal js-create-dir-form js-quick-submit js-requires-input' do
           .form-group
-            = label_tag :dir_name, 'Directory name', class: 'control-label'
+            = label_tag :dir_name, _('Directory name'), class: 'control-label'
             .col-sm-10
               = text_field_tag :dir_name, params[:dir_name], required: true, class: 'form-control'
 
-          = render 'shared/new_commit_form', placeholder: "Add new directory"
+          = render 'shared/new_commit_form', placeholder: _("Add new directory")
 
           .form-actions
-            = submit_tag "Create directory", class: 'btn btn-create'
+            = submit_tag _("Create directory"), class: 'btn btn-create'
             = link_to "Cancel", '#', class: "btn btn-cancel", "data-dismiss" => "modal"
 
             - unless can?(current_user, :push_code, @project)

app/views/projects/buttons/_download.html.haml

@@ -2,29 +2,29 @@
 
 - if !project.empty_repo? && can?(current_user, :download_code, project)
   .project-action-button.dropdown.inline>
-    %button.btn{ 'data-toggle' => 'dropdown' }
+    %button.btn.has-tooltip{ title: 'Download', 'data-toggle' => 'dropdown', 'aria-label' => s_('DownloadSource|Download') }
       = icon('download')
       = icon("caret-down")
-      %span.sr-only
-        Select Archive Format
+      %span.sr-only=  _('Select Archive Format')
     %ul.dropdown-menu.dropdown-menu-align-right{ role: 'menu' }
-      %li.dropdown-header Source code
+      %li.dropdown-header
+        #{ _('Source code') }
       %li
         = link_to archive_namespace_project_repository_path(project.namespace, project, ref: ref, format: 'zip'), rel: 'nofollow', download: '' do
           %i.fa.fa-download
-          %span Download zip
+          %span=  _('Download zip')
       %li
         = link_to archive_namespace_project_repository_path(project.namespace, project, ref: ref, format: 'tar.gz'), rel: 'nofollow', download: '' do
           %i.fa.fa-download
-          %span Download tar.gz
+          %span= _('Download tar.gz')
       %li
         = link_to archive_namespace_project_repository_path(project.namespace, project, ref: ref, format: 'tar.bz2'), rel: 'nofollow', download: '' do
           %i.fa.fa-download
-          %span Download tar.bz2
+          %span= _('Download tar.bz2')
       %li
         = link_to archive_namespace_project_repository_path(project.namespace, project, ref: ref, format: 'tar'), rel: 'nofollow', download: '' do
           %i.fa.fa-download
-          %span Download tar
+          %span= _('Download tar')
 
       - if pipeline
         - artifacts = pipeline.builds.latest.with_artifacts
@@ -39,4 +39,5 @@
             %li
               = link_to latest_succeeded_namespace_project_artifacts_path(project.namespace, project, "#{ref}/download", job: job.name), rel: 'nofollow', download: '' do
                 %i.fa.fa-download
-                %span Download '#{job.name}'
+                %span
+                  #{ s_('DownloadArtifacts|Download') } '#{job.name}'

app/views/projects/buttons/_dropdown.html.haml

@@ -12,19 +12,19 @@
         %li
           = link_to new_namespace_project_issue_path(@project.namespace, @project) do
             = icon('exclamation-circle fw')
-            New issue
+            #{ _('New issue') }
 
       - if merge_project
         %li
           = link_to new_namespace_project_merge_request_path(merge_project.namespace, merge_project) do
             = icon('tasks fw')
-            New merge request
+            #{ _('New merge request') }
 
       - if can_create_snippet
         %li
           = link_to new_namespace_project_snippet_path(@project.namespace, @project) do
             = icon('file-text-o fw')
-            New snippet
+            #{ _('New snippet') }
 
       - if can_create_issue || merge_project || can_create_snippet
         %li.divider
@@ -33,20 +33,20 @@
         %li
           = link_to namespace_project_new_blob_path(@project.namespace, @project, @project.default_branch || 'master') do
             = icon('file fw')
-            New file
+            #{ _('New file') }
         %li
           = link_to new_namespace_project_branch_path(@project.namespace, @project) do
             = icon('code-fork fw')
-            New branch
+            #{ _('New branch') }
         %li
           = link_to new_namespace_project_tag_path(@project.namespace, @project) do
             = icon('tags fw')
-            New tag
+            #{ _('New tag') }
       - elsif current_user && current_user.already_forked?(@project)
         %li
           = link_to namespace_project_new_blob_path(@project.namespace, @project, @project.default_branch || 'master') do
             = icon('file fw')
-            New file
+            #{ _('New file') }
       - elsif can?(current_user, :fork_project, @project)
         %li
           - continue_params = { to:         namespace_project_new_blob_path(@project.namespace, @project, @project.default_branch || 'master'),
@@ -56,4 +56,4 @@
                                                                                   continue:       continue_params)
           = link_to fork_path, method: :post do
             = icon('file fw')
-            New file
+            #{ _('New file') }

app/views/projects/buttons/_fork.html.haml

 - unless @project.empty_repo?
   - if current_user && can?(current_user, :fork_project, @project)
     - if current_user.already_forked?(@project) && current_user.manageable_namespaces.size < 2
-      = link_to namespace_project_path(current_user, current_user.fork_of(@project)), title: 'Go to your fork', class: 'btn has-tooltip' do
+      = link_to namespace_project_path(current_user, current_user.fork_of(@project)), title: _('Go to your fork'), class: 'btn has-tooltip' do
         = custom_icon('icon_fork')
-        %span Fork
+        %span= s_('GoToYourFork|Fork')
     - else
       = link_to new_namespace_project_fork_path(@project.namespace, @project), title: 'Fork project', class: 'btn' do
         = custom_icon('icon_fork')
-        %span Fork
+        %span= s_('CreateNewFork|Fork')
     .count-with-arrow
       %span.arrow
-      = link_to namespace_project_forks_path(@project.namespace, @project), title: 'Forks', class: 'count' do
+      = link_to namespace_project_forks_path(@project.namespace, @project), title: n_('Forks', @project.forks_count), class: 'count' do
         = @project.forks_count

app/views/projects/buttons/_koding.html.haml

 - if koding_enabled? && current_user && @repository.koding_yml && can_push_branch?(@project, @project.default_branch)
   = link_to koding_project_url(@project), class: 'btn project-action-button inline', target: '_blank', rel: 'noopener noreferrer' do
-    Run in IDE (Koding)
+    _('Run in IDE (Koding)')

app/views/projects/buttons/_star.html.haml

@@ -2,19 +2,19 @@
   = link_to toggle_star_namespace_project_path(@project.namespace, @project), { class: 'btn star-btn toggle-star', method: :post, remote: true } do
     - if current_user.starred?(@project)
       = icon('star')
-      %span.starred Unstar
+      %span.starred=  _('Unstar')
     - else
       = icon('star-o')
-      %span Star
+      %span= s_('StarProject|Star')
   .count-with-arrow
     %span.arrow
     %span.count.star-count
       = @project.star_count
 
 - else
-  = link_to new_user_session_path, class: 'btn has-tooltip star-btn', title: 'You must sign in to star a project' do
+  = link_to new_user_session_path, class: 'btn has-tooltip star-btn', title: _('You must sign in to star a project') do
     = icon('star')
-    Star
+    #{ s_('StarProject|Star') }
   .count-with-arrow
     %span.arrow
     %span.count

app/views/projects/commits/_commit.html.haml

@@ -31,12 +31,12 @@
             = preserve(markdown(commit.description, pipeline: :single_line, author: commit.author))
         .commiter
           = commit_author_link(commit, avatar: false, size: 24)
-          committed
+          #{ _('committed') }
           #{time_ago_with_tooltip(commit.committed_date)}
 
       .commit-actions.flex-row.hidden-xs
         - if commit.status(ref)
           = render_commit_status(commit, ref: ref)
         = link_to commit.short_id, namespace_project_commit_path(project.namespace, project, commit), class: "commit-sha btn btn-transparent"
-        = clipboard_button(text: commit.id, title: "Copy commit SHA to clipboard")
+        = clipboard_button(text: commit.id, title: _("Copy commit SHA to clipboard"))
         = link_to_browse_code(project, commit)

app/views/projects/commits/_head.html.haml

@@ -5,35 +5,35 @@
       %ul{ class: (container_class) }
         = nav_link(controller: %w(tree blob blame edit_tree new_tree find_file)) do
           = link_to project_files_path(@project) do
-            Files
+            #{ _('Files') }
 
         = nav_link(controller: [:commit, :commits]) do
           = link_to namespace_project_commits_path(@project.namespace, @project, current_ref) do
-            Commits
+            #{ _('Commits') }
 
         = nav_link(html_options: {class: branches_tab_class}) do
           = link_to namespace_project_branches_path(@project.namespace, @project) do
-            Branches
+            #{ _('Branches') }
 
         = nav_link(controller: [:tags, :releases]) do
           = link_to namespace_project_tags_path(@project.namespace, @project) do
-            Tags
+            #{ _('Tags') }
 
         = nav_link(path: 'graphs#show') do
           = link_to namespace_project_graph_path(@project.namespace, @project, current_ref) do
-            Contributors
+            #{ _('Contributors') }
 
         = nav_link(controller: %w(network)) do
           = link_to namespace_project_network_path(@project.namespace, @project, current_ref) do
-            Graph
+            #{ s_('ProjectNetworkGraph|Graph') }
 
         = nav_link(controller: :compare) do
           = link_to namespace_project_compare_index_path(@project.namespace, @project, from: @repository.root_ref, to: current_ref) do
-            Compare
+            #{ _('Compare') }
 
         = nav_link(path: 'graphs#charts') do
           = link_to charts_namespace_project_graph_path(@project.namespace, @project, current_ref) do
-            Charts
+            #{ _('Charts') }
 
         - if @project.feature_available?(:file_lock)
           = nav_link(controller: [:path_locks]) do

app/views/projects/cycle_analytics/show.html.haml

@@ -2,7 +2,6 @@
 - page_title "Cycle Analytics"
 - content_for :page_specific_javascripts do
   = page_specific_javascript_bundle_tag('common_vue')
-  = page_specific_javascript_bundle_tag('locale')
   = page_specific_javascript_bundle_tag('cycle_analytics')
 
 = render "projects/head"

app/views/projects/find_file/show.html.haml

@@ -10,7 +10,7 @@
         = link_to namespace_project_tree_path(@project.namespace, @project, @ref) do
           = @project.path
       %li.file-finder
-        %input#file_find.form-control.file-finder-input{ type: "text", placeholder: 'Find by path', autocomplete: 'off' }
+        %input#file_find.form-control.file-finder-input{ type: "text", placeholder: _('Find by path'), autocomplete: 'off' }
 
   .tree-content-holder
     .table-holder

app/views/projects/no_repo.html.haml

 %h2
   %i.fa.fa-warning
-  No repository
+  #{ _('No repository') }
 
 %p.slead
-  The repository for this project does not exist.
+  #{ _('The repository for this project does not exist.') }
   %br
-  This means you can not push code until you create an empty repository or import existing one.
+  #{ _('This means you can not push code until you create an empty repository or import existing one.') }
 %hr
 
 .no-repo-actions
   = link_to namespace_project_repository_path(@project.namespace, @project), method: :post, class: 'btn btn-primary' do
-    Create empty bare repository
+    #{ _('Create empty bare repository') }
 
   %strong.prepend-left-10.append-right-10 or
 
   = link_to new_namespace_project_import_path(@project.namespace, @project), class: 'btn' do
-    Import repository
+    #{ _('Import repository') }
 
 - if can? current_user, :remove_project, @project
   .prepend-top-20
-    = link_to 'Remove project', project_path(@project), data: { confirm: remove_project_message(@project)}, method: :delete, class: "btn btn-remove pull-right"
+    = link_to _('Remove project'), project_path(@project), data: { confirm: remove_project_message(@project)}, method: :delete, class: "btn btn-remove pull-right"

app/views/projects/show.html.haml

@@ -20,24 +20,24 @@
     %ul.nav
       %li
         = link_to project_files_path(@project) do
-          Files (#{storage_counter(@project.statistics.total_repository_size)})
+          #{_('Files')} (#{storage_counter(@project.statistics.total_repository_size)})
       %li
         = link_to namespace_project_commits_path(@project.namespace, @project, current_ref) do
-          #{'Commit'.pluralize(@project.statistics.commit_count)} (#{number_with_delimiter(@project.statistics.commit_count)})
-      %li
+          #{n_('Commit', 'Commits', @project.statistics.commit_count)} (#{number_with_delimiter(@project.statistics.commit_count)})
+      %l
         = link_to namespace_project_branches_path(@project.namespace, @project) do
-          #{'Branch'.pluralize(@repository.branch_count)} (#{number_with_delimiter(@repository.branch_count)})
+          #{n_('Branch', 'Branches', @repository.branch_count)} (#{number_with_delimiter(@repository.branch_count)})
       %li
         = link_to namespace_project_tags_path(@project.namespace, @project) do
-          #{'Tag'.pluralize(@repository.tag_count)} (#{number_with_delimiter(@repository.tag_count)})
+          #{n_('Tag', 'Tags', @repository.tag_count)} (#{number_with_delimiter(@repository.tag_count)})
 
       - if default_project_view != 'readme' && @repository.readme
         %li
-          = link_to 'Readme', readme_path(@project)
+          = link_to _('Readme'), readme_path(@project)
 
       - if @repository.changelog
         %li
-          = link_to 'Changelog', changelog_path(@project)
+          = link_to _('Changelog'), changelog_path(@project)
 
       - if @repository.license_blob
         %li
@@ -45,43 +45,43 @@
 
       - if @repository.contribution_guide
         %li
-          = link_to 'Contribution guide', contribution_guide_path(@project)
+          = link_to _('Contribution guide'), contribution_guide_path(@project)
 
       - if @repository.gitlab_ci_yml
         %li
-          = link_to 'CI configuration', ci_configuration_path(@project)
+          = link_to _('CI configuration'), ci_configuration_path(@project)
 
       - if current_user && can_push_branch?(@project, @project.default_branch)
         - unless @repository.changelog
           %li.missing
             = link_to add_special_file_path(@project, file_name: 'CHANGELOG') do
-              Add Changelog
+              #{ _('Add Changelog') }
         - unless @repository.license_blob
           %li.missing
             = link_to add_special_file_path(@project, file_name: 'LICENSE') do
-              Add License
+              #{ _('Add License') }
         - unless @repository.contribution_guide
           %li.missing
             = link_to add_special_file_path(@project, file_name: 'CONTRIBUTING.md', commit_message: 'Add contribution guide') do
-              Add Contribution guide
+              #{ _('Add Contribution guide') }
         - unless @repository.gitlab_ci_yml
           %li.missing
             = link_to add_special_file_path(@project, file_name: '.gitlab-ci.yml') do
-              Set up CI
+              #{ _('Set up CI') }
         - if koding_enabled? && @repository.koding_yml.blank?
           %li.missing
-            = link_to 'Set up Koding', add_koding_stack_path(@project)
+            = link_to  _('Set up Koding'), add_koding_stack_path(@project)
         - if @repository.gitlab_ci_yml.blank? && @project.deployment_service.present?
           %li.missing
             = link_to add_special_file_path(@project, file_name: '.gitlab-ci.yml', commit_message: 'Set up auto deploy', branch_name: 'auto-deploy', context: 'autodeploy') do
-              Set up auto deploy
+              #{ _('Set up auto deploy') }
 
 %div{ class: container_class }
   - if @project.archived?
     .text-warning.center.prepend-top-20
       %p
         = icon("exclamation-triangle fw")
-        Archived project! Repository is read-only
+        #{ _('Archived project! Repository is read-only') }
 
   - view_path = default_project_view
 

app/views/projects/tree/_tree_content.html.haml

@@ -3,10 +3,10 @@
     %table.table#tree-slider{ class: "table_#{@hex_path} tree-table" }
       %thead
         %tr
-          %th Name
+          %th= s_('ProjectFileTree|Name')
           %th.hidden-xs
-            .pull-left Last commit
-          %th.text-right Last Update
+            .pull-left= _('Last commit')
+          %th.text-right= _('Last Update')
       - if @path.present?
         %tr.tree-item
           %td.tree-item-file-name
@@ -20,7 +20,7 @@
     = render "projects/tree/readme", readme: tree.readme
 
 - if can_edit_tree?
-  = render 'projects/blob/upload', title: 'Upload New File', placeholder: 'Upload new file', button_title: 'Upload file', form_path: namespace_project_create_blob_path(@project.namespace, @project, @id), method: :post
+  = render 'projects/blob/upload', title: _('Upload New File'), placeholder: _('Upload New File'), button_title: _('Upload file'), form_path: namespace_project_create_blob_path(@project.namespace, @project, @id), method: :post
   = render 'projects/blob/new_dir'
 
 - if @project.feature_available?(:file_lock)

app/views/projects/tree/_tree_header.html.haml

@@ -3,7 +3,7 @@
 
   = render 'projects/find_file_link'
 
-  = link_to 'History', namespace_project_commits_path(@project.namespace, @project, @id), class: 'btn btn-grouped'
+  = link_to s_('Commits|History'), namespace_project_commits_path(@project.namespace, @project, @id), class: 'btn btn-grouped'
 
   = render 'projects/buttons/download', project: @project, ref: @ref
 
@@ -22,7 +22,7 @@
   - if current_user
     %li
       - if !on_top_of_branch?
-        %span.btn.add-to-tree.disabled.has-tooltip{ title: "You can only add files when you are on a branch", data: { container: 'body' } }
+        %span.btn.add-to-tree.disabled.has-tooltip{ title: _("You can only add files when you are on a branch"), data: { container: 'body' } }
           = icon('plus')
       - else
         %span.dropdown
@@ -33,15 +33,15 @@
               %li
                 = link_to namespace_project_new_blob_path(@project.namespace, @project, @id) do
                   = icon('pencil fw')
-                  New file
+                  #{ _('New file') }
               %li
                 = link_to '#modal-upload-blob', { 'data-target' => '#modal-upload-blob', 'data-toggle' => 'modal' } do
                   = icon('file fw')
-                  Upload file
+                  #{ _('Upload file') }
               %li
                 = link_to '#modal-create-new-dir', { 'data-target' => '#modal-create-new-dir', 'data-toggle' => 'modal' } do
                   = icon('folder fw')
-                  New directory
+                  #{ _('New directory') }
             - elsif can?(current_user, :fork_project, @project)
               %li
                 - continue_params = { to:         namespace_project_new_blob_path(@project.namespace, @project, @id),
@@ -51,7 +51,7 @@
                                                                                         continue:       continue_params)
                 = link_to fork_path, method: :post do
                   = icon('pencil fw')
-                  New file
+                  #{ _('New file') }
               %li
                 - continue_params = { to:         request.fullpath,
                                       notice:     edit_in_new_fork_notice + " Try to upload a file again.",
@@ -60,7 +60,7 @@
                                                                                         continue:       continue_params)
                 = link_to fork_path, method: :post do
                   = icon('file fw')
-                  Upload file
+                  #{ _('Upload file') }
               %li
                 - continue_params = { to:         request.fullpath,
                                       notice:     edit_in_new_fork_notice + " Try to create a new directory again.",
@@ -69,14 +69,14 @@
                                                                                         continue:       continue_params)
                 = link_to fork_path, method: :post do
                   = icon('folder fw')
-                  New directory
+                  #{ _('New directory') }
 
             %li.divider
             %li
               = link_to new_namespace_project_branch_path(@project.namespace, @project) do
                 = icon('code-fork fw')
-                New branch
+                #{ _('New branch') }
             %li
               = link_to new_namespace_project_tag_path(@project.namespace, @project) do
                 = icon('tags fw')
-                New tag
+                #{ _('New tag') }

app/views/projects/tree/show.html.haml

 - @no_container = true
 
-- page_title @path.presence || "Files", @ref
+- page_title @path.presence || _("Files"), @ref
 = content_for :meta_tags do
   = auto_discovery_link_tag(:atom, namespace_project_commits_url(@project.namespace, @project, @ref, rss_url_options), title: "#{@project.name}:#{@ref} commits")
 = render "projects/commits/head"

app/views/shared/_clone_panel.html.haml

@@ -22,7 +22,7 @@
 
   = text_field_tag :project_clone, default_url_to_repo(project), class: "js-select-on-focus form-control", readonly: true, aria: { label: 'Project clone URL' }
   .input-group-btn
-    = clipboard_button(target: '#project_clone', title: "Copy URL to clipboard")
+    = clipboard_button(target: '#project_clone', title: _("Copy URL to clipboard"))
 
     = geo_button(modal_target: '#modal-geo-info') if Gitlab::Geo.secondary?
 

app/views/shared/_no_password.html.haml

 - if cookies[:hide_no_password_message].blank? && !current_user.hide_no_password && current_user.require_password?
   .no-password-message.alert.alert-warning
-    You won't be able to pull or push project code via #{gitlab_config.protocol.upcase} until you #{link_to 'set a password', edit_profile_password_path} on your account
+    - set_password_link = link_to s_('SetPasswordToCloneLink|set a password'), edit_profile_password_path
+    - translation_params = { protocol: gitlab_config.protocol.upcase, set_password_link: set_password_link }
+    - set_password_message = _("You won't be able to pull or push project code via %{protocol} until you %{set_password_link} on your account") % translation_params
 
     .alert-link-group
-      = link_to "Don't show again", profile_path(user: {hide_no_password: true}), method: :put
+      = link_to _("Don't show again"), profile_path(user: {hide_no_password: true}), method: :put
       |
-      = link_to 'Remind later', '#', class: 'hide-no-password-message'
+      = link_to _('Remind later'), '#', class: 'hide-no-password-message'

app/views/shared/_no_ssh.html.haml

 - if cookies[:hide_no_ssh_message].blank? && !current_user.hide_no_ssh_key && current_user.require_ssh_key?
   .no-ssh-key-message.alert.alert-warning
-    You won't be able to pull or push project code via SSH until you #{link_to 'add an SSH key', profile_keys_path, class: 'alert-link'} to your profile
-
+    - add_ssh_key_link = link_to s_('MissingSSHKeyWarningLink|add an SSH key'), profile_keys_path, class: 'alert-link'
+    - ssh_message = _("You won't be able to pull or push project code via SSH until you %{add_ssh_key_link} to your profile") % { add_ssh_key_link: add_ssh_key_link }
+    #{ ssh_message.html_safe }
     .alert-link-group
-      = link_to "Don't show again", profile_path(user: {hide_no_ssh_key: true}), method: :put, class: 'alert-link'
+      = link_to _("Don't show again"), profile_path(user: {hide_no_ssh_key: true}), method: :put, class: 'alert-link'
       |
-      = link_to 'Remind later', '#', class: 'hide-no-ssh-message alert-link'
+      = link_to _('Remind later'), '#', class: 'hide-no-ssh-message alert-link'

app/views/shared/_ref_switcher.html.haml

@@ -6,9 +6,9 @@
   - @options && @options.each do |key, value|
     = hidden_field_tag key, value, id: nil
   .dropdown
-    = dropdown_toggle dropdown_toggle_text, { toggle: "dropdown", selected: dropdown_toggle_text, ref: @ref, refs_url: refs_namespace_project_path(@project.namespace, @project), field_name: 'ref', submit_form_on_click: true }, { toggle_class: "js-project-refs-dropdown git-revision-dropdown-toggle" }
+    = dropdown_toggle dropdown_toggle_text, { toggle: "dropdown", selected: dropdown_toggle_text, ref: @ref, refs_url: refs_namespace_project_path(@project.namespace, @project), field_name: 'ref', submit_form_on_click: true }, { toggle_class: "js-project-refs-dropdown" }
     .dropdown-menu.dropdown-menu-selectable.git-revision-dropdown{ class: ("dropdown-menu-align-right" if local_assigns[:align_right]) }
-      = dropdown_title "Switch branch/tag"
-      = dropdown_filter "Search branches and tags"
+      = dropdown_title _("Switch branch/tag")
+      = dropdown_filter _("Search branches and tags")
       = dropdown_content
       = dropdown_loading

app/views/shared/members/_access_request_buttons.html.haml

@@ -2,16 +2,17 @@
 
 .project-action-button.inline
   - if can?(current_user, :"destroy_#{model_name}_member", source.members.find_by(user_id: current_user.id))
-    = link_to "Leave #{model_name}", polymorphic_path([:leave, source, :members]),
+    - link_text = source.is_a?(Group) ? _('Leave group') : _('Leave project')
+    = link_to link_text, polymorphic_path([:leave, source, :members]),
               method: :delete,
               data: { confirm: leave_confirmation_message(source) },
               class: 'btn'
   - elsif requester = source.requesters.find_by(user_id: current_user.id)
-    = link_to 'Withdraw Access Request', polymorphic_path([:leave, source, :members]),
+    = link_to _('Withdraw Access Request'), polymorphic_path([:leave, source, :members]),
               method: :delete,
               data: { confirm: remove_member_message(requester) },
               class: 'btn'
   - elsif source.request_access_enabled && can?(current_user, :request_access, source)
-    = link_to 'Request Access', polymorphic_path([:request_access, source, :members]),
+    = link_to _('Request Access'), polymorphic_path([:request_access, source, :members]),
               method: :post,
               class: 'btn'

app/views/shared/notifications/_custom_notifications.html.haml

@@ -5,7 +5,7 @@
         %button.close{ type: "button",  "aria-label": "close", data: { dismiss: "modal" } }
           %span{ "aria-hidden": "true" } } ×
         %h4#custom-notifications-title.modal-title
-          Custom notification events
+          #{ _('Custom notification events') }
 
       .modal-body
         .container-fluid
@@ -13,12 +13,11 @@
             = hidden_setting_source_input(notification_setting)
             .row
               .col-lg-4
-                %h4.prepend-top-0
-                  Notification events
+                %h4.prepend-top-0= _('Notification events')
                 %p
-                  Custom notification levels are the same as participating levels. With custom notification levels you will also receive notifications for select events. To find out more, check out
-                  = succeed "." do
-                    %a{ href: help_page_path('workflow/notifications'), target: "_blank" } notification emails
+                  - notification_link = link_to _('notification emails'), help_page_path('workflow/notifications'), target: '_blank'
+                  - paragraph = _('Custom notification levels are the same as participating levels. With custom notification levels you will also receive notifications for select events. To find out more, check out %{notification_link}.') % { notification_link: notification_link.html_safe }
+                  #{ paragraph.html_safe }
               .col-lg-8
                 - NotificationSetting::EMAIL_EVENTS.each_with_index do |event, index|
                   - field_id = "#{notifications_menu_identifier("modal", notification_setting)}_notification_setting[#{event}]"

changelogs/unreleased/bvl-translate-project-pages.yml

+---
+title: Translate backend for Project & Repository pages
+merge_request: 11183
+author:

config/webpack.config.js

@@ -188,15 +188,7 @@ var config = {
 
     // create cacheable common library bundles
     new webpack.optimize.CommonsChunkPlugin({
-      names: ['main', 'common', 'runtime'],
-    }),
-
-    // locale common library
-    new webpack.optimize.CommonsChunkPlugin({
-      name: 'locale',
-      chunks: [
-        'cycle_analytics',
-      ],
+      names: ['main', 'locale', 'common', 'runtime'],
     }),
   ],
 

lib/gitlab/ci/status/canceled.rb

@@ -3,11 +3,11 @@ module Gitlab
     module Status
       class Canceled < Status::Core
         def text
-          'canceled'
+          s_('CiStatusText|canceled')
         end
 
         def label
-          'canceled'
+          s_('CiStatusLabel|canceled')
         end
 
         def icon

lib/gitlab/ci/status/created.rb

@@ -3,11 +3,11 @@ module Gitlab
     module Status
       class Created < Status::Core
         def text
-          'created'
+          s_('CiStatusText|created')
         end
 
         def label
-          'created'
+          s_('CiStatusLabel|created')
         end
 
         def icon

lib/gitlab/ci/status/failed.rb

@@ -3,11 +3,11 @@ module Gitlab
     module Status
       class Failed < Status::Core
         def text
-          'failed'
+          s_('CiStatusText|failed')
         end
 
         def label
-          'failed'
+          s_('CiStatusLabel|failed')
         end
 
         def icon

lib/gitlab/ci/status/manual.rb

@@ -3,11 +3,11 @@ module Gitlab
     module Status
       class Manual < Status::Core
         def text
-          'manual'
+          s_('CiStatusText|manual')
         end
 
         def label
-          'manual action'
+          s_('CiStatusLabel|manual action')
         end
 
         def icon

lib/gitlab/ci/status/pending.rb

@@ -3,11 +3,11 @@ module Gitlab
     module Status
       class Pending < Status::Core
         def text
-          'pending'
+          s_('CiStatusText|pending')
         end
 
         def label
-          'pending'
+          s_('CiStatusLabel|pending')
         end
 
         def icon

lib/gitlab/ci/status/pipeline/blocked.rb

@@ -4,11 +4,11 @@ module Gitlab
       module Pipeline
         class Blocked < Status::Extended
           def text
-            'blocked'
+            s_('CiStatusText|blocked')
           end
 
           def label
-            'waiting for manual action'
+            s_('CiStatusLabel|waiting for manual action')
           end
 
           def self.matches?(pipeline, user)

lib/gitlab/ci/status/running.rb

@@ -3,11 +3,11 @@ module Gitlab
     module Status
       class Running < Status::Core
         def text
-          'running'
+          s_('CiStatus|running')
         end
 
         def label
-          'running'
+          s_('CiStatus|running')
         end
 
         def icon

lib/gitlab/ci/status/skipped.rb

@@ -3,11 +3,11 @@ module Gitlab
     module Status
       class Skipped < Status::Core
         def text
-          'skipped'
+          s_('CiStatusText|skipped')
         end
 
         def label
-          'skipped'
+          s_('CiStatusLabel|skipped')
         end
 
         def icon

lib/gitlab/ci/status/success.rb

@@ -3,11 +3,11 @@ module Gitlab
     module Status
       class Success < Status::Core
         def text
-          'passed'
+          s_('CiStatusText|passed')
         end
 
         def label
-          'passed'
+          s_('CiStatusLabel|passed')
         end
 
         def icon

lib/gitlab/ci/status/success_warning.rb

@@ -7,11 +7,11 @@ module Gitlab
       #
       class SuccessWarning < Status::Extended
         def text
-          'passed'
+          s_('CiStatusText|passed')
         end
 
         def label
-          'passed with warnings'
+          s_('CiStatusLabel|passed with warnings')
         end
 
         def icon

lib/gitlab/visibility_level.rb

@@ -41,9 +41,9 @@ module Gitlab
 
       def options
         {
-          'Private'  => PRIVATE,
-          'Internal' => INTERNAL,
-          'Public'   => PUBLIC
+          N_('VisibilityLevel|Private')  => PRIVATE,
+          N_('VisibilityLevel|Internal') => INTERNAL,
+          N_('VisibilityLevel|Public')   => PUBLIC
         }
       end
 

spec/features/projects/new_project_spec.rb

@@ -17,10 +17,10 @@ feature "New project", feature: true do
         expect(find_field("project_visibility_level_#{level}")).to be_checked
       end
 
-      it 'saves visibility level on validation error' do
+      it "saves visibility level #{level} on validation error" do
         visit new_project_path
 
-        choose(key)
+        choose(s_(key))
         click_button('Create project')
 
         expect(find_field("project_visibility_level_#{level}")).to be_checked

spec/helpers/notifications_helper_spec.rb

@@ -12,5 +12,11 @@ describe NotificationsHelper do
   describe 'notification_title' do
     it { expect(notification_title(:watch)).to match('Watch') }
     it { expect(notification_title(:mention)).to match('On mention') }
+    it { expect(notification_title(:global)).to match('Global') }
+  end
+
+  describe '#notification_event_name' do
+    it { expect(notification_event_name(:success_pipeline)).to match('Successful pipeline') }
+    it { expect(notification_event_name(:failed_pipeline)).to match('Failed pipeline') }
   end
 end

spec/javascripts/build_spec.js

@@ -58,7 +58,7 @@ describe('Build', () => {
 
       it('displays the remove date correctly', () => {
         const removeDateElement = document.querySelector('.js-artifacts-remove');
-        expect(removeDateElement.innerText.trim()).toBe('1 year');
+        expect(removeDateElement.innerText.trim()).toBe('1 year remaining');
       });
     });
 

spec/javascripts/datetime_utility_spec.js

@@ -2,6 +2,26 @@ import '~/lib/utils/datetime_utility';
 
 (() => {
   describe('Date time utils', () => {
+    describe('timeFor', () => {
+      it('returns `past due` when in past', () => {
+        const date = new Date();
+        date.setFullYear(date.getFullYear() - 1);
+
+        expect(
+          gl.utils.timeFor(date),
+        ).toBe('Past due');
+      });
+
+      it('returns remaining time when in the future', () => {
+        const date = new Date();
+        date.setFullYear(date.getFullYear() + 1);
+
+        expect(
+          gl.utils.timeFor(date),
+        ).toBe('1 year remaining');
+      });
+    });
+
     describe('get day name', () => {
       it('should return Sunday', () => {
         const day = gl.utils.getDayName(new Date('07/17/2016'));

spec/services/projects/create_service_spec.rb

@@ -139,7 +139,7 @@ describe Projects::CreateService, '#execute', services: true do
       stub_application_setting(restricted_visibility_levels: [Gitlab::VisibilityLevel::PUBLIC])
 
       opts.merge!(
-        visibility_level: Gitlab::VisibilityLevel.options['Public']
+        visibility_level: Gitlab::VisibilityLevel::PUBLIC
       )
     end