Merge pull request #3624 from westlywright/2.3.backport.translations.fixes

[2.3] Translations Fixes

Author: westlywright

app/components/form-scoped-roles/component.js

@@ -278,7 +278,7 @@ export default Component.extend(NewOrEdit, {
     let principal = get(this, 'principal');
 
     if ( !principal ) {
-      errors.push(this.get('intl').findTranslationByKey('rolesPage.new.errors.memberReq'));
+      errors.push(this.get('intl').t('rolesPage.new.errors.memberReq'));
       set(this, 'errors', errors);
 
       return false;

app/models/mountentry.js

@@ -29,10 +29,10 @@ export default Resource.extend({
 
     switch (permission) {
     case 'ro':
-      out = intl.findTranslationByKey('formVolumeRow.opts.ro');
+      out = intl.t('formVolumeRow.opts.ro');
       break;
     case 'rw':
-      out = intl.findTranslationByKey('formVolumeRow.opts.rw');
+      out = intl.t('formVolumeRow.opts.rw');
       break;
     default:
       out = permission;

lib/global-admin/addon/accounts/edit/controller.js

@@ -52,15 +52,15 @@ export default Controller.extend(NewOrEdit, {
     let ok     = this.validate();
 
     if (this.canUserLogIn && !this.canUserLogIn()) {
-      errors.push(this.intl.findTranslationByKey('formGlobalRoles.loginError'));
+      errors.push(this.intl.t('formGlobalRoles.loginError'));
     }
 
     if (!ok) {
       return false;
     }
 
     if (get(this, 'password.length') > 0 && (get(this, 'password') || '').trim().length === 0) {
-      errors.push(get(this, 'intl').findTranslationByKey('accountsPage.new.errors.pwReq'));
+      errors.push(get(this, 'intl').t('accountsPage.new.errors.pwReq'));
     }
 
     if (errors.length) {

lib/global-admin/addon/accounts/new/controller.js

@@ -73,19 +73,19 @@ export default Controller.extend(NewOrEdit, {
     var errors = [];
 
     if (this.canUserLogIn && !this.canUserLogIn()) {
-      errors.push(this.intl.findTranslationByKey('formGlobalRoles.loginError'));
+      errors.push(this.intl.t('formGlobalRoles.loginError'));
     }
 
     if ((get(this, 'model.account.username') || '').trim().length === 0) {
-      errors.push(get(this, 'intl').findTranslationByKey('accountsPage.new.errors.usernameReq'));
+      errors.push(get(this, 'intl').t('accountsPage.new.errors.usernameReq'));
     }
 
     if (this.doesExist()) {
-      errors.push(get(this, 'intl').findTranslationByKey('accountsPage.new.errors.usernameInExists'));
+      errors.push(get(this, 'intl').t('accountsPage.new.errors.usernameInExists'));
     }
 
     if ((get(this, 'model.account.password') || '').trim().length === 0) {
-      errors.push(get(this, 'intl').findTranslationByKey('accountsPage.new.errors.pwReq'));
+      errors.push(get(this, 'intl').t('accountsPage.new.errors.pwReq'));
     }
 
     if (errors.length) {

lib/global-admin/addon/components/new-edit-role/component.js

@@ -148,7 +148,7 @@ export default Component.extend(NewOrEdit, {
     var errors = get(this, 'errors') || [];
 
     if ((get(this, 'primaryResource.name') || '').trim().length === 0) {
-      errors.push(get(this, 'intl').findTranslationByKey('rolesPage.new.errors.nameReq'));
+      errors.push(get(this, 'intl').t('rolesPage.new.errors.nameReq'));
     }
 
     set(this, 'errors', errors);

lib/shared/addon/components/input-identity/component.js

@@ -148,9 +148,9 @@ export default Component.extend({
     let intl = get(this, 'intl');
 
     if ( get(this, 'access.provider') === 'githubconfig' ) {
-      out = intl.findTranslationByKey('inputIdentity.dropdownLabel.teams');
+      out = intl.t('inputIdentity.dropdownLabel.teams');
     } else {
-      out = intl.findTranslationByKey('inputIdentity.dropdownLabel.groups');
+      out = intl.t('inputIdentity.dropdownLabel.groups');
     }
 
     return intl.formatMessage(out);

lib/shared/addon/mixins/upgrade-component.js

@@ -63,7 +63,7 @@ export default Mixin.create({
   }),
 
   currentVersion: computed('model.externalIdInfo.{version}', 'model.externalId', function() {
-    let text = get(this, 'intl').findTranslationByKey('upgradeBtn.version.current');
+    let text = get(this, 'intl').t('upgradeBtn.version.current');
     let version = get(this, 'model.externalIdInfo.version');
 
     if (typeof version === 'string' || typeof version === 'number') {