Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-28 19:49:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup and deduplicate languages

Browse source
This commit is contained in:
djmaze 2021-01-21 17:21:19 +01:00
parent 67db19ec80
commit a28b5c2b6c
52 changed files with 1124 additions and 2030 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dev/App/User.js
View file

@ -171,7 +171,7 @@ class AppUser extends AbstractApp {
MessageStore.messageList([]);
MessageStore.messageListLoading(false);
MessageStore.messageListError(
oData && oData.ErrorCode ? getNotification(oData.ErrorCode) : i18n('NOTIFICATIONS/CANT_GET_MESSAGE_LIST')
getNotification((oData && oData.ErrorCode) || Notification.CantGetMessageList)
);
}
},
@ -920,7 +920,7 @@ class AppUser extends AbstractApp {
this.bootend();
showScreenPopup(require('View/Popup/TwoFactorConfiguration'), [true]);
} else {
rl.setWindowTitle(i18n('TITLES/LOADING'));
rl.setWindowTitle(i18n('GLOBAL/LOADING'));
// require.ensure([], function() { // require code splitting

15
dev/Common/Enums.js
View file

@ -350,20 +350,17 @@ export const ContactPropertyType = {
export const Notification = {
InvalidToken: 101,
AuthError: 102,
AccessError: 103,
ConnectionError: 104,
CaptchaError: 105,
DomainNotAllowed: 109,
AccountNotAllowed: 110,
AccountTwoFactorAuthRequired: 120,
AccountTwoFactorAuthError: 121,
CouldNotSaveNewPassword: 130,
CurrentPasswordIncorrect: 131,
NewPasswordShort: 132,
NewPasswordWeak: 133,
NewPasswordForbidden: 134,
// CurrentPasswordIncorrect: 131,
// NewPasswordShort: 132,
// NewPasswordWeak: 133,
// NewPasswordForbidden: 134,
ContactsSyncError: 140,
@ -381,7 +378,7 @@ export const Notification = {
CantGetFilters: 352,
CantActivateFiltersScript: 353,
CantDeleteFiltersScript: 354,
FiltersAreNotCorrect: 355,
// FiltersAreNotCorrect: 355,
CantCreateFolder: 400,
CantRenameFolder: 401,
@ -390,7 +387,7 @@ export const Notification = {
CantUnsubscribeFolder: 404,
CantDeleteNonEmptyFolder: 405,
CantSaveSettings: 501,
// CantSaveSettings: 501,
CantSavePluginSettings: 502,
DomainAlreadyExists: 601,

4
dev/Model/Message.js
View file

@ -377,10 +377,10 @@ class MessageModel extends AbstractModel {
.replace('{{date}}', encodeHtml(m ? m.format('LLL') : ''))
.replace('{{fromCreds}}', encodeHtml(this.fromToLine(false)))
.replace('{{toCreds}}', encodeHtml(this.toToLine(false)))
.replace('{{toLabel}}', encodeHtml(i18n('MESSAGE/LABEL_TO')))
.replace('{{toLabel}}', encodeHtml(i18n('GLOBAL/TO')))
.replace('{{ccHide}}', ccLine ? '' : 'hidden=""')
.replace('{{ccCreds}}', encodeHtml(ccLine))
.replace('{{ccLabel}}', encodeHtml(i18n('MESSAGE/LABEL_CC')))
.replace('{{ccLabel}}', encodeHtml(i18n('GLOBAL/CC')))
.replace('{{bodyClass}}', this.isHtml() ? 'html' : 'plain')
.replace('{{html}}', this.bodyAsHTML())
);

1
dev/Remote/AbstractFetch.js
View file

@ -22,7 +22,6 @@ checkResponseError = data => {
} else {
if ([
Notification.AuthError,
Notification.AccessError,
Notification.ConnectionError,
Notification.DomainNotAllowed,
Notification.AccountNotAllowed,

2
dev/Screen/User/Settings.js
View file

@ -91,7 +91,7 @@ class SettingsUserScreen extends AbstractSettingsScreen {
}
if (Settings.capa(Capa.OpenPGP)) {
addSettingsViewModel(OpenPgpUserSettings, 'SettingsOpenPGP', 'SETTINGS_LABELS/LABEL_OPEN_PGP_NAME', 'openpgp');
addSettingsViewModel(OpenPgpUserSettings, 'SettingsOpenPGP', 'OpenPGP', 'openpgp');
}
runSettingsViewModelHooks(false);

8
dev/View/Popup/Compose.js
View file

@ -1002,20 +1002,20 @@ class ComposePopupView extends AbstractViewNext {
'<br /><br />' +
i18n('COMPOSE/FORWARD_MESSAGE_TOP_TITLE') +
'<br />' +
i18n('COMPOSE/FORWARD_MESSAGE_TOP_FROM') +
i18n('GLOBAL/FROM') +
': ' +
sFrom +
'<br />' +
i18n('COMPOSE/FORWARD_MESSAGE_TOP_TO') +
i18n('GLOBAL/TO') +
': ' +
sTo +
(sCc.length ? '<br />' + i18n('COMPOSE/FORWARD_MESSAGE_TOP_CC') + ': ' + sCc : '') +
(sCc.length ? '<br />' + i18n('GLOBAL/CC') + ': ' + sCc : '') +
'<br />' +
i18n('COMPOSE/FORWARD_MESSAGE_TOP_SENT') +
': ' +
encodeHtml(sDate) +
'<br />' +
i18n('COMPOSE/FORWARD_MESSAGE_TOP_SUBJECT') +
i18n('GLOBAL/SUBJECT') +
': ' +
encodeHtml(sSubject) +
'<br /><br />' +

6
dev/View/Popup/Filter.js
View file

@ -64,9 +64,9 @@ class FilterPopupView extends AbstractViewNext {
this.actionTypeOptions([]);
this.fieldOptions([
{ 'id': FilterConditionField.From, 'name': i18n('POPUPS_FILTER/SELECT_FIELD_FROM') },
{ 'id': FilterConditionField.From, 'name': i18n('GLOBAL/FROM') },
{ 'id': FilterConditionField.Recipient, 'name': i18n('POPUPS_FILTER/SELECT_FIELD_RECIPIENTS') },
{ 'id': FilterConditionField.Subject, 'name': i18n('POPUPS_FILTER/SELECT_FIELD_SUBJECT') },
{ 'id': FilterConditionField.Subject, 'name': i18n('GLOBAL/SUBJECT') },
{ 'id': FilterConditionField.Size, 'name': i18n('POPUPS_FILTER/SELECT_FIELD_SIZE') },
{ 'id': FilterConditionField.Header, 'name': i18n('POPUPS_FILTER/SELECT_FIELD_HEADER') }
]);
@ -79,7 +79,7 @@ class FilterPopupView extends AbstractViewNext {
]);
// this.actionTypeOptions.push({'id': FiltersAction.None,
// 'name': i18n('POPUPS_FILTER/SELECT_ACTION_NONE')});
// 'name': i18n('GLOBAL/NONE')});
const modules = SieveStore.capa();
if (modules) {
if (modules.includes('imap4flags')) {