Merge pull request #565 from transloadit/fix/more-i18n-strings

Fix more i18n strings

src/plugins/Dashboard/FileCard.js

@@ -56,9 +56,9 @@ module.exports = class FileCard extends Component {
       {this.props.fileCardFor &&
         <div style="width: 100%; height: 100%;">
           <div class="uppy-DashboardContent-bar">
-            <h2 class="uppy-DashboardContent-title">Editing <span class="uppy-DashboardContent-titleFile">{file.meta ? file.meta.name : file.name}</span></h2>
-            <button class="uppy-DashboardContent-back" type="button" title="Finish editing file"
-              onclick={this.handleClick}>Done</button>
+            <h2 class="uppy-DashboardContent-title">{this.props.i18n('editing')} <span class="uppy-DashboardContent-titleFile">{file.meta ? file.meta.name : file.name}</span></h2>
+            <button class="uppy-DashboardContent-back" type="button" title={this.props.i18n('finishEditingFile')}
+              onclick={this.handleClick}>{this.props.i18n('done')}</button>
           </div>
           <div class="uppy-DashboardFileCard-inner">
             <div class="uppy-DashboardFileCard-preview" style={{ backgroundColor: getFileTypeIcon(file.type).color }}>
@@ -72,12 +72,12 @@ module.exports = class FileCard extends Component {
             </div>
             <div class="uppy-DashboardFileCard-info">
               <fieldset class="uppy-DashboardFileCard-fieldset">
-                <label class="uppy-DashboardFileCard-label">Name</label>
+                <label class="uppy-DashboardFileCard-label">{this.props.i18n('name')}</label>
                 <input class="uppy-DashboardFileCard-input"
                   type="text"
                   data-name="name"
                   value={file.meta.name || ''}
-                  placeholder="name"
+                  placeholder={this.props.i18n('name')}
                   onkeyup={this.tempStoreMetaOrSubmit}
                   onkeydown={this.tempStoreMetaOrSubmit}
                   onkeypress={this.tempStoreMetaOrSubmit} />
@@ -88,7 +88,7 @@ module.exports = class FileCard extends Component {
           <div class="uppy-Dashboard-actions">
             <button class="UppyButton--circular UppyButton--blue uppy-DashboardFileCard-done"
               type="button"
-              title="Finish editing file"
+              title={this.props.i18n('finishEditingFiles')}
               onclick={this.handleClick}>{checkIcon()}</button>
           </div>
         </div>

src/plugins/Dashboard/FileItem.js

@@ -119,8 +119,8 @@ module.exports = function fileItem (props) {
       {!uploadInProgressOrComplete &&
         <button class="uppy-DashboardItem-edit"
           type="button"
-          aria-label="Edit file"
-          title="Edit file"
+          aria-label={props.i18n('editFile')}
+          title={props.i18n('editFile')}
           onclick={(e) => props.showFileCard(file.id)}>
           {iconEdit()}
         </button>
@@ -128,15 +128,15 @@ module.exports = function fileItem (props) {
       {file.uploadURL &&
         <button class="uppy-DashboardItem-copyLink"
           type="button"
-          aria-label="Copy link"
-          title="Copy link"
+          aria-label={props.i18n('copyLink')}
+          title={props.i18n('copyLink')}
           onclick={() => {
             copyToClipboard(file.uploadURL, props.i18n('copyLinkToClipboardFallback'))
-            .then(() => {
-              props.log('Link copied to clipboard.')
-              props.info(props.i18n('copyLinkToClipboardSuccess'), 'info', 3000)
-            })
-            .catch(props.log)
+              .then(() => {
+                props.log('Link copied to clipboard.')
+                props.info(props.i18n('copyLinkToClipboardSuccess'), 'info', 3000)
+              })
+              .catch(props.log)
           }}>{iconCopy()}</button>
       }
     </div>
@@ -144,8 +144,8 @@ module.exports = function fileItem (props) {
       {!isUploaded &&
         <button class="uppy-DashboardItem-remove"
           type="button"
-          aria-label="Remove file"
-          title="Remove file"
+          aria-label={props.i18n('removeFile')}
+          title={props.i18n('removeFile')}
           onclick={() => props.removeFile(file.id)}>
           <svg aria-hidden="true" class="UppyIcon" width="60" height="60" viewBox="0 0 60 60" xmlns="http://www.w3.org/2000/svg">
             <path stroke="#FFF" stroke-width="1" fill-rule="nonzero" vector-effect="non-scaling-stroke" d="M30 1C14 1 1 14 1 30s13 29 29 29 29-13 29-29S46 1 30 1z" />

src/plugins/Dashboard/index.js

@@ -46,8 +46,14 @@ module.exports = class Dashboard extends Plugin {
         dashboardTitle: 'Uppy Dashboard',
         copyLinkToClipboardSuccess: 'Link copied to clipboard.',
         copyLinkToClipboardFallback: 'Copy the URL below',
+        copyLink: 'Copy link',
         fileSource: 'File source',
         done: 'Done',
+        name: 'Name',
+        removeFile: 'Remove file',
+        editFile: 'Edit file',
+        editing: 'Editing',
+        finishEditingFile: 'Finish editing file',
         localDisk: 'Local Disk',
         myDevice: 'My Device',
         dropPasteImport: 'Drop files here, paste, import from one of the locations above or',
@@ -57,6 +63,14 @@ module.exports = class Dashboard extends Plugin {
         numberOfSelectedFiles: 'Number of selected files',
         uploadAllNewFiles: 'Upload all new files',
         emptyFolderAdded: 'No files were added from empty folder',
+        uploadXFiles: {
+          0: 'Upload %{smart_count} file',
+          1: 'Upload %{smart_count} files'
+        },
+        uploadXNewFiles: {
+          0: 'Upload +%{smart_count} file',
+          1: 'Upload +%{smart_count} files'
+        },
         folderAdded: {
           0: 'Added %{smart_count} file from %{folder}',
           1: 'Added %{smart_count} files from %{folder}'
@@ -500,7 +514,8 @@ module.exports = class Dashboard extends Plugin {
       this.uppy.use(StatusBar, {
         target: this,
         hideUploadButton: this.opts.hideUploadButton,
-        hideAfterFinish: this.opts.hideProgressAfterFinish
+        hideAfterFinish: this.opts.hideProgressAfterFinish,
+        locale: this.opts.locale
       })
     }