Avoid newlines in externalized strings

c6430785 · Bob Van Landuyt · f241de2d · c6430785 · c6430785 · c6430785
Commit c6430785 authored Jul 06, 2018 by Bob Van Landuyt
3 changed files
--- a/ee/app/controllers/ee/projects/git_http_client_controller.rb
+++ b/ee/app/controllers/ee/projects/git_http_client_controller.rb
@@ -74,9 +74,8 @@ module EE
        end

        def incorrect_version_message
-          _("You need git-lfs version %{min_git_lfs_version} (or greater) to
-            continue. Please visit https://git-lfs.github.com") %
-            { min_git_lfs_version: MINIMUM_GIT_LFS_VERSION }
+          translation = _("You need git-lfs version %{min_git_lfs_version} (or greater) to continue. Please visit https://git-lfs.github.com")
+          translation % { min_git_lfs_version: MINIMUM_GIT_LFS_VERSION }
        end
      end


--- a/ee/app/controllers/ee/projects/lfs_api_controller.rb
+++ b/ee/app/controllers/ee/projects/lfs_api_controller.rb
@@ -20,10 +20,9 @@ module EE
      def lfs_read_only_message
        return super unless ::Gitlab::Geo.secondary_with_primary?

-        (_('You cannot write to a read-only secondary GitLab Geo instance.
-          Please use %{link_to_primary_node} instead.') %
-          { link_to_primary_node: geo_primary_default_url_to_repo(project) }
-        ).html_safe
+        translation = _('You cannot write to a read-only secondary GitLab Geo instance. Please use %{link_to_primary_node} instead.')
+        message = translation % { link_to_primary_node: geo_primary_default_url_to_repo(project) }
+        message.html_safe
      end
    end
  end

--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gitlab 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-06 14:35+0200\n"
-"PO-Revision-Date: 2018-07-06 14:35+0200\n"
+"POT-Creation-Date: 2018-07-09 08:42+0200\n"
+"PO-Revision-Date: 2018-07-09 08:42+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -235,6 +235,15 @@ msgstr ""
 msgid "404|Please contact your GitLab administrator if you think this is a mistake."
 msgstr ""

+msgid "<strong>%{created_count}</strong> created, <strong>%{accepted_count}</strong> accepted."
+msgstr ""
+
+msgid "<strong>%{created_count}</strong> created, <strong>%{closed_count}</strong> closed."
+msgstr ""
+
+msgid "<strong>%{pushes}</strong> pushes, more than <strong>%{commits}</strong> commits by <strong>%{people}</strong> contributors."
+msgstr ""
+
 msgid "<strong>Removes</strong> source branch"
 msgstr ""

@@ -2568,6 +2577,9 @@ msgstr ""
 msgid "Expand sidebar"
 msgstr ""

+msgid "Explore groups"
+msgstr ""
+
 msgid "Explore projects"
 msgstr ""

@@ -3050,6 +3062,27 @@ msgstr ""
 msgid "Groups can also be nested by creating %{subgroup_docs_link_start}subgroups%{subgroup_docs_link_end}."
 msgstr ""

+msgid "GroupsDropdown|Frequently visited"
+msgstr ""
+
+msgid "GroupsDropdown|Groups you visit often will appear here"
+msgstr ""
+
+msgid "GroupsDropdown|Loading groups"
+msgstr ""
+
+msgid "GroupsDropdown|Search your groups"
+msgstr ""
+
+msgid "GroupsDropdown|Something went wrong on our end."
+msgstr ""
+
+msgid "GroupsDropdown|Sorry, no groups matched your search"
+msgstr ""
+
+msgid "GroupsDropdown|This feature requires browser localStorage support"
+msgstr ""
+
 msgid "GroupsEmptyState|A group is a collection of several projects."
 msgstr ""

@@ -3285,6 +3318,9 @@ msgstr ""
 msgid "Issues can be bugs, tasks or ideas to be discussed. Also, issues are searchable and filterable."
 msgstr ""

+msgid "Issues closed"
+msgstr ""
+
 msgid "Jan"
 msgstr ""

@@ -3527,12 +3563,18 @@ msgstr ""
 msgid "Members will be forwarded here when signing in to your group. Get this from your identity provider, where it can also be called \"SSO Service Location\", \"SAML Token Issuance Endpoint\", or \"SAML 2.0/W-Federation URL\"."
 msgstr ""

+msgid "Merge Request"
+msgstr ""
+
 msgid "Merge Request:"
 msgstr ""

 msgid "Merge Requests"
 msgstr ""

+msgid "Merge Requests created"
+msgstr ""
+
 msgid "Merge events"
 msgstr ""

@@ -3862,12 +3904,21 @@ msgstr ""
 msgid "No files found."
 msgstr ""

+msgid "No issues for the selected time period."
+msgstr ""
+
+msgid "No merge requests for the selected time period."
+msgstr ""
+
 msgid "No merge requests found"
 msgstr ""

 msgid "No messages were logged"
 msgstr ""

+msgid "No pushes for the selected time period."
+msgstr ""
+
 msgid "No repository"
 msgstr ""

@@ -4006,6 +4057,9 @@ msgstr ""
 msgid "Only project members can comment."
 msgstr ""

+msgid "Oops, are you sure?"
+msgstr ""
+
 msgid "Open"
 msgstr ""

@@ -4324,6 +4378,9 @@ msgstr ""
 msgid "Profiles|Account scheduled for removal."
 msgstr ""

+msgid "Profiles|Add key"
+msgstr ""
+
 msgid "Profiles|Change username"
 msgstr ""

@@ -4351,9 +4408,15 @@ msgstr ""
 msgid "Profiles|Path"
 msgstr ""

+msgid "Profiles|This doesn't look like a public SSH key, are you sure you want to add it?"
+msgstr ""
+
 msgid "Profiles|Type your %{confirmationValue} to confirm:"
 msgstr ""

+msgid "Profiles|Typically starts with \"ssh-rsa …\""
+msgstr ""
+
 msgid "Profiles|Update username"
 msgstr ""

@@ -4372,6 +4435,9 @@ msgstr ""
 msgid "Profiles|Your account is currently an owner in these groups:"
 msgstr ""

+msgid "Profiles|e.g. My MacBook key"
+msgstr ""
+
 msgid "Profiles|your account"
 msgstr ""

@@ -4498,9 +4564,6 @@ msgstr ""
 msgid "ProjectsDropdown|Sorry, no projects matched your search"
 msgstr ""

-msgid "ProjectsDropdown|This feature requires browser localStorage support"
-msgstr ""
-
 msgid "PrometheusDashboard|Time"
 msgstr ""

@@ -4639,6 +4702,9 @@ msgstr ""
 msgid "Pushed"
 msgstr ""

+msgid "Pushes"
+msgstr ""
+
 msgid "Quarters"
 msgstr ""

@@ -4914,9 +4980,18 @@ msgstr ""
 msgid "Seconds to wait for a storage access attempt"
 msgstr ""

+msgid "Security Dashboard"
+msgstr ""
+
 msgid "Security report"
 msgstr ""

+msgid "SecurityDashboard|Monitor vulnerabilities in your code"
+msgstr ""
+
+msgid "SecurityDashboard|Pipeline %{pipelineLink} triggered"
+msgstr ""
+
 msgid "Select"
 msgstr ""

@@ -6331,6 +6406,9 @@ msgstr ""
 msgid "Yes"
 msgstr ""

+msgid "Yes, add it"
+msgstr ""
+
 msgid "You are going to remove %{group_name}. Removed groups CANNOT be restored! Are you ABSOLUTELY sure?"
 msgstr ""

@@ -6376,9 +6454,7 @@ msgstr ""
 msgid "You can resolve the merge conflict using either the Interactive mode, by choosing %{use_ours} or %{use_theirs} buttons, or by editing the files directly. Commit these changes into %{branch_name}"
 msgstr ""

-msgid ""
-"You cannot write to a read-only secondary GitLab Geo instance.\n"
-"          Please use %{link_to_primary_node} instead."
+msgid "You cannot write to a read-only secondary GitLab Geo instance. Please use %{link_to_primary_node} instead."
 msgstr ""

 msgid "You cannot write to this read-only GitLab instance."
@@ -6411,9 +6487,7 @@ msgstr ""
 msgid "You need a different license to enable FileLocks feature"
 msgstr ""

-msgid ""
-"You need git-lfs version %{min_git_lfs_version} (or greater) to\n"
-"            continue. Please visit https://git-lfs.github.com"
+msgid "You need git-lfs version %{min_git_lfs_version} (or greater) to continue. Please visit https://git-lfs.github.com"
 msgstr ""

 msgid "You need permission."
@@ -6879,6 +6953,9 @@ msgstr ""
 msgid "mrWidget|No Approval required; you can still approve"
 msgstr ""

+msgid "mrWidget|Open in Web IDE"
+msgstr ""
+
 msgid "mrWidget|Plain diff"
 msgstr ""

@@ -6951,9 +7028,6 @@ msgstr ""
 msgid "mrWidget|This project is archived, write access has been disabled"
 msgstr ""

-msgid "mrWidget|Web IDE"
-msgstr ""
-
 msgid "mrWidget|You can merge this merge request manually using the"
 msgstr ""