Skip to content

chore: Deduplicate translations and remove obsolete #5356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 22, 2020
Merged

chore: Deduplicate translations and remove obsolete #5356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43c6bad
chore: Use same translation message IDs
iamareebjamal Oct 22, 2020
535cc46
chore: Remove obsolete translations
iamareebjamal Oct 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/adapters/application.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export default JSONAPIAdapter.extend(HasManyQueryAdapterMixin, FastbootAdapter,

isInvalid(statusCode) {
if (statusCode !== 404 && statusCode !== 422 && statusCode !== 403 && statusCode !== 409) {
this.notify.error('An unexpected error occurred.', {
this.notify.error('An unexpected error has occurred.', {
closeAfter : 5000,
id : 'serve_error'
});
Expand Down
2 changes: 1 addition & 1 deletion app/components/account/contact-info-section.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export default Component.extend(FormMixin, {
},
{
type : 'email',
prompt : this.l10n.t('Please enter a valid email ID')
prompt : this.l10n.t('Please enter a valid email address')
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion app/components/account/email-preferences-section.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default class EmailPreferencesSection extends Component {
.catch(e => {
console.error('Error while updating email notifications.', e);
emailPreference.rollbackAttributes();
this.notify.error(this.l10n.t('An unexpected error occurred.'), {
this.notify.error(this.l10n.t('An unexpected error has occurred.'), {
id: 'email_error'
});
});
Expand Down
2 changes: 1 addition & 1 deletion app/components/events/view/export/download-common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export default class DownloadCommon extends Component {
.catch(e => {
console.error('Error while starting exporting job', e);
this.set('isLoading', false);
this.notify.error(this.l10n.t('Unexpected error occurred.'), {
this.notify.error(this.l10n.t('An unexpected error has occurred.'), {
id: 'unexpected_down_error'
});
});
Expand Down
2 changes: 1 addition & 1 deletion app/components/forms/admin/settings/system/mail-settings/test-email-form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export default class TestEmailForm extends Component.extend(FormMixin) {
})
.catch(e => {
console.error('Error while sending test email', e);
this.notify.error(this.l10n.t('An unexpected error has occurred'), {
this.notify.error(this.l10n.t('An unexpected error has occurred.'), {
id: 'test_mail_err'
});
});
Expand Down
6 changes: 3 additions & 3 deletions app/components/forms/login-form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export default class LoginForm extends Component.extend(FormMixin) {
},
{
type : 'email',
prompt : this.l10n.t('Please enter a valid email ID')
prompt : this.l10n.t('Please enter a valid email address')
}
]
},
Expand Down Expand Up @@ -67,7 +67,7 @@ export default class LoginForm extends Component.extend(FormMixin) {
this.set('errorMessage', this.l10n.tVar(e.json.error));
} else {
console.error('Error while authentication', e);
this.set('errorMessage', this.l10n.t('An unexpected error occurred.'));
this.set('errorMessage', this.l10n.t('An unexpected error has occurred.'));
}
}

Expand All @@ -94,7 +94,7 @@ export default class LoginForm extends Component.extend(FormMixin) {
});
} else {
console.error('Error while facebook authentication', e);
this.notify.error(this.l10n.t('An unexpected error has occurred'), {
this.notify.error(this.l10n.t('An unexpected error has occurred.'), {
id: 'unexpect_error'
});
}
Expand Down
2 changes: 1 addition & 1 deletion app/components/forms/orders/guest-order-form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export default Component.extend(FormMixin, {
},
{
type : 'email',
prompt : this.l10n.t('Please enter a valid email ID')
prompt : this.l10n.t('Please enter a valid email address')
}
]
},
Expand Down
4 changes: 2 additions & 2 deletions app/components/forms/orders/order-form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export default Component.extend(FormMixin, {
},
{
type : 'email',
prompt : this.l10n.t('Please enter a valid email')
prompt : this.l10n.t('Please enter a valid email address')
}
]
};
Expand Down Expand Up @@ -476,7 +476,7 @@ export default Component.extend(FormMixin, {
rules: [
{
type : 'empty',
prompt : 'Please enter ' + field.name
prompt : this.l10n.t('Please enter {{field}}', { field: field.name })
}
]
};
Expand Down
4 changes: 2 additions & 2 deletions app/components/forms/reset-password-form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export default Component.extend(FormMixin, {
},
{
type : 'email',
prompt : this.l10n.t('Please enter a valid email ID')
prompt : this.l10n.t('Please enter a valid email address')
}
]
},
Expand Down Expand Up @@ -114,7 +114,7 @@ export default Component.extend(FormMixin, {
this.set('errorMessage', this.l10n.t('No account is registered with this email address.'));
} else {
console.error('Error while submitting reset password', reason);
this.set('errorMessage', this.l10n.t('An unexpected error occurred.'));
this.set('errorMessage', this.l10n.t('An unexpected error has occurred.'));
}
})
.finally(() => {
Expand Down
6 changes: 3 additions & 3 deletions app/components/forms/session-speaker-form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ export default Component.extend(FormMixin, {
},
{
type : 'email',
prompt : this.l10n.t('Please enter a valid email')
prompt : this.l10n.t('Please enter a valid email address')
}
]
},
Expand All @@ -209,7 +209,7 @@ export default Component.extend(FormMixin, {
},
{
type : 'email',
prompt : this.l10n.t('Please enter a valid email')
prompt : this.l10n.t('Please enter a valid email address')
}
]
},
Expand Down Expand Up @@ -387,7 +387,7 @@ export default Component.extend(FormMixin, {
rules: [
{
type : 'empty',
prompt : 'Please enter ' + field.name
prompt : this.l10n.t('Please enter {{field}}', { field: field.name })
}
]
};
Expand Down
2 changes: 1 addition & 1 deletion app/components/forms/user-profile-form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export default Component.extend(FormMixin, {
},
{
type : 'email',
prompt : this.l10n.t('Please enter a valid email ID')
prompt : this.l10n.t('Please enter a valid email address')
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion app/components/forms/wizard/basic-details-step.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ export default Component.extend(FormMixin, EventWizardMixin, {
rules : [
{
type : 'email',
prompt : this.l10n.t('Please enter a valid email')
prompt : this.l10n.t('Please enter a valid email address')
},
{
type : 'empty',
Expand Down
2 changes: 1 addition & 1 deletion app/components/notification-dropdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export default class NotificationDropdown extends Component {
})
.catch(e => {
console.error('Error while marking notifications as read.', e);
this.notify.error(this.l10n.t('An unexpected error occurred.'), {
this.notify.error(this.l10n.t('An unexpected error has occurred.'), {
id: 'not_read_error'
});
});
Expand Down
2 changes: 1 addition & 1 deletion app/components/widgets/forms/image-upload.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export default class ImageUpload extends Component {
.catch(e => {
console.error('Error while uploading and setting image URL', e);
this.set('uploadingImage', false);
this.set('errorMessage', this.i18n.t('An unexpected error occurred.'));
this.set('errorMessage', this.i18n.t('An unexpected error has occurred.'));
});
}

Expand Down
2 changes: 1 addition & 1 deletion app/controllers/admin/content/translations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export default class extends Controller {
});
} catch (e) {
console.error('Error downloading translation zip', e);
this.notify.error(this.l10n.t('Unexpected error occurred.'),
this.notify.error(this.l10n.t('An unexpected error has occurred.'),
{
id: 'zip_error'
});
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/event-invoice/paid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export default class extends Controller {
document.body.removeChild(anchor);
} catch (e) {
console.error('Error while downloading event invoice', e);
this.notify.error(this.l10n.t('Unexpected error occurred.'),
this.notify.error(this.l10n.t('An unexpected error has occurred.'),
{
id: 'event_here_error'
});
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/events/view/export.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export default class extends Controller {
})
.catch(() => {
this.set('isLoading', false);
this.notify.error(this.l10n.t('Unexpected error occurred.'),
this.notify.error(this.l10n.t('An unexpected error has occurred.'),
{
id: 'event_error_export'
});
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/events/view/tickets/attendees/list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
this.refreshModel.bind(this)();
})
.catch(() => {
this.notify.error(this.l10n.t('An unexpected error has occurred'));
this.notify.error(this.l10n.t('An unexpected error has occurred.'));
});
}
}
2 changes: 1 addition & 1 deletion app/controllers/notifications.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export default class NotificationsController extends Controller {
});
})
.catch(() => {
this.notify.error(this.l10n.t('An unexpected error occurred.'),
this.notify.error(this.l10n.t('An unexpected error has occurred.'),
{
id: 'mark_read_error'
});
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/oauth/callback.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export default class CallbackController extends Controller {
if (reason && Object.prototype.hasOwnProperty.call(reason, 'status_code') && reason.status_code === 401) {
this.set('errorMessage', this.l10n.t('Your credentials were incorrect.'));
} else {
this.set('errorMessage', this.l10n.t('An unexpected error occurred.'));
this.set('errorMessage', this.l10n.t('An unexpected error has occurred.'));
}
this.set('isLoading', false);
} else {
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/public/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export default class IndexController extends Controller {
if (reason && reason.status === 401) {
this.set('errorMessage', this.l10n.t('Your credentials were incorrect.'));
} else {
this.set('errorMessage', this.l10n.t('An unexpected error occurred.'));
this.set('errorMessage', this.l10n.t('An unexpected error has occurred.'));
}
} else {
console.warn(reason);
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/register.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export default class RegisterController extends Controller {
} else if (reason?.errors[0]?.status === '422') {
this.set('errorMessage', this.l10n.t('Invalid email address.'));
} else {
this.set('errorMessage', this.l10n.t('An unexpected error occurred.'));
this.set('errorMessage', this.l10n.t('An unexpected error has occurred.'));
}
})
.finally(() => {
Expand Down Expand Up @@ -67,7 +67,7 @@ export default class RegisterController extends Controller {
if (reason && Object.prototype.hasOwnProperty.call(reason, 'errors') && reason.status_code === 401) {
this.set('errorMessage', this.l10n.t('Your credentials were incorrect.'));
} else {
this.set('errorMessage', this.l10n.t('An unexpected error occurred.'));
this.set('errorMessage', this.l10n.t('An unexpected error has occurred.'));
}
} else {
console.warn(reason);
Expand Down
2 changes: 1 addition & 1 deletion app/mixins/event-wizard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ export default Mixin.create(MutableArray, CustomFormMixin, {
this.notify.error(this.l10n.tVar(error.detail));
});
} else {
this.notify.error(this.l10n.t('An unexpected error has occurred'));
this.notify.error(this.l10n.t('An unexpected error has occurred.'));
}
})
.finally(() => {
Expand Down
4 changes: 2 additions & 2 deletions app/mixins/notifications.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export default Mixin.create({
this.notify.success(this.l10n.t('Marked as Read successfully'));
})
.catch(() => {
this.notify.error(this.l10n.t('An unexpected error occurred.'));
this.notify.error(this.l10n.t('An unexpected error has occurred.'));
});
},
markAllAsRead(notifications) {
Expand All @@ -27,7 +27,7 @@ export default Mixin.create({
})
.catch(e => {
console.error('Error while marking all notifications as read', e);
this.notify.error(this.l10n.t('An unexpected error occurred.'));
this.notify.error(this.l10n.t('An unexpected error has occurred.'));
});
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/services/auth-manager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ export default class AuthManagerService extends Service {
} catch (e) {
console.warn(e);
this.session.invalidate();
this.notify.error(this.l10n.t('An unexpected error has occurred'));
this.notify.error(this.l10n.t('An unexpected error has occurred.'));
}

} else {
Expand Down
30 changes: 15 additions & 15 deletions app/services/l10n.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,21 @@ export default class L10nService extends L10n {

@computed(function() {
return {
'bn' : this.t('বাংলা'),
'zh_Hans' : this.t('中文 (简化版)'),
'zh_Hant' : this.t('中文 (傳統的)'),
'en' : this.t('English'),
'fr' : this.t('français'),
'de' : this.t('Deutsche'),
'id' : this.t('bahasa Indonesia'),
'ko' : this.t('한국어'),
'pl' : this.t('Polskie'),
'es' : this.t('Español'),
'th' : this.t('ไทย'),
'vi' : this.t('Tiếng Việt'),
'hi' : this.t('हिंदी'),
'ja' : this.t('日本語'),
'ru' : this.t('русский')
'bn' : 'বাংলা',
'zh_Hans' : '中文 (简化版)',
'zh_Hant' : '中文 (傳統的)',
'en' : 'English',
'fr' : 'français',
'de' : 'Deutsche',
'id' : 'bahasa Indonesia',
'ko' : '한국어',
'pl' : 'Polskie',
'es' : 'Español',
'th' : 'ไทย',
'vi' : 'Tiếng Việt',
'hi' : 'हिंदी',
'ja' : '日本語',
'ru' : 'русский'
};
})
availableLocales;
Expand Down
Loading