Merge pull request #905 from JessicaBarh/plural-translations

handle localization of plurals

Author: fcollonval

src/commandsAndMenu.tsx

@@ -716,11 +716,11 @@ export function addCommands(
       const extensions = files
         .map(file => PathExt.extname(file.to))
         .filter(extension => extension.length > 0);
-      const subject = extensions.length > 1 ? 'extensions' : 'extension';
-      return trans.__(
-        'Ignore %1 %2 (add to .gitignore)',
-        extensions.join(', '),
-        trans.__(subject)
+      return trans._n(
+        'Ignore %2 extension (add to .gitignore)',
+        'Ignore %2 extensions (add to .gitignore)',
+        extensions.length,
+        extensions.join(', ')
       );
     },
     caption: pluralizedContextLabel(

src/components/CommitBox.tsx

@@ -125,7 +125,7 @@ export class CommitBox extends React.Component<
           className={commitButtonClass}
           type="button"
           title={title}
-          value="Commit"
+          value={this.props.trans.__('Commit')}
           disabled={disabled}
           onClick={this._onCommitSubmit}
         />

src/components/TagMenu.tsx

@@ -19,8 +19,6 @@ import {
 import { tagIcon } from '../style/icons';
 import { IGitExtension, Level } from '../tokens';
 
-const CHANGES_ERR_MSG =
-  'The repository contains files with uncommitted changes. Please commit or discard these changes before switching to a tag.';
 const ITEM_HEIGHT = 24.8; // HTML element height for a single branch
 const MIN_HEIGHT = 150; // Minimal HTML element height for the tags list
 const MAX_HEIGHT = 400; // Maximal HTML element height for the tags list
@@ -297,7 +295,9 @@ export class TagMenu extends React.Component<ITagMenuProps, ITagMenuState> {
       if (!self.props.branching) {
         showErrorMessage(
           self.props.trans.__('Checkout tags is disabled'),
-          self.props.trans.__(CHANGES_ERR_MSG)
+          self.props.trans.__(
+            'The repository contains files with uncommitted changes. Please commit or discard these changes before switching to a tag.'
+          )
         );
         return;
       }