Revert "resolve lint in locale/gitlab.pot"

This reverts commit ada2c529.

ee/app/assets/javascripts/vue_shared/security_reports/split_security_reports_app.vue

@@ -133,22 +133,24 @@ export default {
       this.setSastContainerHeadPath(this.sastContainerHeadPath);
 
       this.fetchSastContainerReports()
-        .then(() => {
-          this.$emit('updateBadgeCount', this.sastContainer.newIssues.length);
-        })
-        .catch(() =>
-          createFlash(s__('ciReport|There was an error loading container scanning report')),
-        );
+      .then(() => {
+        this.$emit('updateBadgeCount', this.sastContainer.newIssues.length);
+      })
+      .catch(() =>
+        createFlash(s__('ciReport|There was an error loading container scanning report')),
+      );
     }
 
     if (this.dastHeadPath) {
       this.setDastHeadPath(this.dastHeadPath);
 
       this.fetchDastReports()
-        .then(() => {
-          this.$emit('updateBadgeCount', this.dast.newIssues.length);
-        })
-        .catch(() => createFlash(s__('ciReport|There was an error loading DAST report')));
+      .then(() => {
+        this.$emit('updateBadgeCount', this.dast.newIssues.length);
+      })
+      .catch(() =>
+        createFlash(s__('ciReport|There was an error loading DAST report')),
+      );
     }
   },
 
@@ -175,8 +177,8 @@ export default {
         });
       }
       return sprintf(
-        n__('%{type} detected %{count} vulnerability', '%{type} detected %{count} vulnerabilities'),
-        { type, count: issuesCount },
+        n__('%{type} detected %d vulnerability', '%{type} detected %d vulnerabilities', issuesCount),
+        { type },
       );
     },
     translateText(type) {

ee/app/assets/javascripts/vue_shared/security_reports/store/utils.js

@@ -18,24 +18,24 @@ export const findIssueIndex = (issues, issue) =>
  * @param {Array} feedback
  */
 function enrichVulnerabilityWithfeedback(vulnerability, feedback = []) {
-  return feedback
-    .filter(fb => fb.project_fingerprint === vulnerability.project_fingerprint)
-    .reduce((vuln, fb) => {
-      if (fb.feedback_type === 'dismissal') {
-        return {
-          ...vuln,
-          isDismissed: true,
-          dismissalFeedback: fb,
-        };
-      } else if (fb.feedback_type === 'issue') {
-        return {
-          ...vuln,
-          hasIssue: true,
-          issueFeedback: fb,
-        };
-      }
-      return vuln;
-    }, vulnerability);
+  return feedback.filter(
+    fb => fb.project_fingerprint === vulnerability.project_fingerprint,
+  ).reduce((vuln, fb) => {
+    if (fb.feedback_type === 'dismissal') {
+      return {
+        ...vuln,
+        isDismissed: true,
+        dismissalFeedback: fb,
+      };
+    } else if (fb.feedback_type === 'issue') {
+      return {
+        ...vuln,
+        hasIssue: true,
+        issueFeedback: fb,
+      };
+    }
+    return vuln;
+  }, vulnerability);
 }
 
 /**
@@ -155,30 +155,24 @@ export const parseSastContainer = (issues = [], feedback = []) =>
     const parsed = {
       ...issue,
       category: 'container_scanning',
-      project_fingerprint: sha1(
-        `${issue.namespace}:${issue.vulnerability}:${issue.featurename}:${issue.featureversion}`,
-      ),
+      project_fingerprint: sha1(`${issue.namespace}:${issue.vulnerability}:${issue.featurename}:${issue.featureversion}`),
       title: issue.vulnerability,
-      description: !_.isEmpty(issue.description)
-        ? issue.description
-        : sprintf(s__('ciReport|%{namespace} is affected by %{vulnerability}.'), {
-            namespace: issue.namespace,
-            vulnerability: issue.vulnerability,
-          }),
+      description: !_.isEmpty(issue.description) ? issue.description :
+        sprintf(s__('ciReport|%{namespace} is affected by %{vulnerability}.'), {
+          namespace: issue.namespace,
+          vulnerability: issue.vulnerability,
+        }),
       path: issue.namespace,
-      identifiers: [
-        {
-          type: 'CVE',
-          name: issue.vulnerability,
-          value: issue.vulnerability,
-          url: `https://cve.mitre.org/cgi-bin/cvename.cgi?name=${issue.vulnerability}`,
-        },
-      ],
+      identifiers: [{
+        type: 'CVE',
+        name: issue.vulnerability,
+        value: issue.vulnerability,
+        url: `https://cve.mitre.org/cgi-bin/cvename.cgi?name=${issue.vulnerability}`,
+      }],
     };
 
     // Generate solution
-    if (
-      !_.isEmpty(issue.fixedby) &&
+    if (!_.isEmpty(issue.fixedby) &&
       !_.isEmpty(issue.featurename) &&
       !_.isEmpty(issue.featureversion)
     ) {
@@ -219,14 +213,12 @@ export const parseDastIssues = (issues = [], feedback = []) =>
 
     if (!_.isEmpty(issue.cweid)) {
       Object.assign(parsed, {
-        identifiers: [
-          {
-            type: 'CWE',
-            name: `CWE-${issue.cweid}`,
-            value: issue.cweid,
-            url: `https://cwe.mitre.org/data/definitions/${issue.cweid}.html`,
-          },
-        ],
+        identifiers: [{
+          type: 'CWE',
+          name: `CWE-${issue.cweid}`,
+          value: issue.cweid,
+          url: `https://cwe.mitre.org/data/definitions/${issue.cweid}.html`,
+        }],
       });
     }
 
@@ -276,10 +268,11 @@ export const textBuilder = (
     if (newIssues > 0) {
       return sprintf(
         n__(
-          '%{type} detected %{count} vulnerability for the source branch only',
-          '%{type} detected %{count} vulnerabilities for the source branch only',
+          '%{type} detected %d vulnerability for the source branch only',
+          '%{type} detected %d vulnerabilities for the source branch only',
+          newIssues,
         ),
-        { type, count: newIssues },
+        { type },
       );
     }
 

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-06-19 09:50+0200\n"
-"PO-Revision-Date: 2018-06-19 09:50+0200\n"
+"POT-Creation-Date: 2018-06-13 14:05+0200\n"
+"PO-Revision-Date: 2018-06-13 14:05+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -140,8 +140,8 @@ msgstr ""
 msgid "%{title} changes"
 msgstr ""
 
-msgid "%{type} detected %{count} vulnerability"
-msgid_plural "%{type} detected %{count} vulnerabilities"
+msgid "%{type} detected %d vulnerability"
+msgid_plural "%{type} detected %d vulnerabilities"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -1411,13 +1411,7 @@ msgstr ""
 msgid "ClusterIntegration|Kubernetes clusters can be used to deploy applications and to provide Review Apps for this project"
 msgstr ""
 
-msgid "ClusterIntegration|Learn more about %{help_link_start_machine_type}machine types%{help_link_end} and %{help_link_start_pricing}pricing%{help_link_end}."
-msgstr ""
-
-msgid "ClusterIntegration|Learn more about %{help_link_start}Kubernetes%{help_link_end}."
-msgstr ""
-
-msgid "ClusterIntegration|Learn more about %{help_link_start}zones%{help_link_end}."
+msgid "ClusterIntegration|Learn more about %{link_to_documentation}"
 msgstr ""
 
 msgid "ClusterIntegration|Learn more about environments"
@@ -1513,6 +1507,9 @@ msgstr ""
 msgid "ClusterIntegration|See and edit the details for your Kubernetes cluster"
 msgstr ""
 
+msgid "ClusterIntegration|See zones"
+msgstr ""
+
 msgid "ClusterIntegration|Select machine type"
 msgstr ""
 
@@ -1829,9 +1826,6 @@ msgstr ""
 msgid "Control the maximum concurrency of repository backfill for this secondary node"
 msgstr ""
 
-msgid "Control the maximum concurrency of verification operations for this Geo node"
-msgstr ""
-
 msgid "Copy SSH public key to clipboard"
 msgstr ""
 
@@ -2374,6 +2368,9 @@ msgstr ""
 msgid "Error Reporting and Logging"
 msgstr ""
 
+msgid "Error checking branch data. Please try again."
+msgstr ""
+
 msgid "Error committing changes. Please try again."
 msgstr ""
 
@@ -2625,6 +2622,12 @@ msgstr ""
 msgid "GeoNodes|Full"
 msgstr ""
 
+msgid "Gitaly Servers"
+msgstr ""
+
+msgid "Gitaly|Address"
+msgstr ""
+
 msgid "GeoNodes|GitLab version"
 msgstr ""
 
@@ -2781,9 +2784,6 @@ msgstr ""
 msgid "Geo|Shards to synchronize"
 msgstr ""
 
-msgid "Geo|Verification capacity"
-msgstr ""
-
 msgid "Git repository URL"
 msgstr ""
 
@@ -3516,9 +3516,6 @@ msgstr ""
 msgid "Months"
 msgstr ""
 
-msgid "More actions"
-msgstr ""
-
 msgid "More info"
 msgstr ""
 
@@ -4965,7 +4962,7 @@ msgstr ""
 msgid "Stage"
 msgstr ""
 
-msgid "Stage all changes"
+msgid "Stage all"
 msgstr ""
 
 msgid "Stage changes"
@@ -5646,7 +5643,7 @@ msgstr ""
 msgid "Unresolve discussion"
 msgstr ""
 
-msgid "Unstage all changes"
+msgid "Unstage all"
 msgstr ""
 
 msgid "Unstage changes"
@@ -5997,7 +5994,7 @@ msgstr ""
 msgid "You are on a read-only GitLab instance."
 msgstr ""
 
-msgid "You are on a secondary, <b>read-only</b> Geo node. If you want to make changes, you must visit this page on the %{primary_node}."
+msgid "You are on a secondary (read-only) Geo node. If you want to make any changes, you must visit the %{primary_node}."
 msgstr ""
 
 msgid "You can also create a project from the command line."