Commit 09251f32 authored by JC Brand's avatar JC Brand

Remove the english translation files. No need for them.

parent a4be25e0
This diff is collapsed.
This diff is collapsed.
...@@ -74,7 +74,6 @@ require.config({ ...@@ -74,7 +74,6 @@ require.config({
"af": "locale/af/LC_MESSAGES/converse.json", "af": "locale/af/LC_MESSAGES/converse.json",
"ca": "locale/ca/LC_MESSAGES/converse.json", "ca": "locale/ca/LC_MESSAGES/converse.json",
"de": "locale/de/LC_MESSAGES/converse.json", "de": "locale/de/LC_MESSAGES/converse.json",
"en": "locale/en/LC_MESSAGES/converse.json",
"es": "locale/es/LC_MESSAGES/converse.json", "es": "locale/es/LC_MESSAGES/converse.json",
"fr": "locale/fr/LC_MESSAGES/converse.json", "fr": "locale/fr/LC_MESSAGES/converse.json",
"he": "locale/he/LC_MESSAGES/converse.json", "he": "locale/he/LC_MESSAGES/converse.json",
......
...@@ -379,18 +379,16 @@ ...@@ -379,18 +379,16 @@
handleChatStateMessage: function (message) { handleChatStateMessage: function (message) {
if (message.get('chat_state') === _converse.COMPOSING) { if (message.get('chat_state') === _converse.COMPOSING) {
if(message.get('sender') === 'me') { if (message.get('sender') === 'me') {
this.showStatusNotification(__('Typing from another device')); this.showStatusNotification(__('Typing from another device'));
} } else {
else {
this.showStatusNotification(message.get('fullname')+' '+__('is typing')); this.showStatusNotification(message.get('fullname')+' '+__('is typing'));
} }
this.clear_status_timeout = window.setTimeout(this.clearStatusNotification.bind(this), 30000); this.clear_status_timeout = window.setTimeout(this.clearStatusNotification.bind(this), 30000);
} else if (message.get('chat_state') === _converse.PAUSED) { } else if (message.get('chat_state') === _converse.PAUSED) {
if(message.get('sender') === 'me') { if (message.get('sender') === 'me') {
this.showStatusNotification(__('Stopped typing on the other device')); this.showStatusNotification(__('Stopped typing on the other device'));
} } else {
else {
this.showStatusNotification(message.get('fullname')+' '+__('has stopped typing')); this.showStatusNotification(message.get('fullname')+' '+__('has stopped typing'));
} }
} else if (_.includes([_converse.INACTIVE, _converse.ACTIVE], message.get('chat_state'))) { } else if (_.includes([_converse.INACTIVE, _converse.ACTIVE], message.get('chat_state'))) {
......
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
'text!af', 'text!af',
'text!ca', 'text!ca',
'text!de', 'text!de',
'text!en',
'text!es', 'text!es',
'text!fr', 'text!fr',
'text!he', 'text!he',
...@@ -32,21 +31,20 @@ ...@@ -32,21 +31,20 @@
'af': arguments[1], 'af': arguments[1],
'ca': arguments[2], 'ca': arguments[2],
'de': arguments[3], 'de': arguments[3],
'en': arguments[4], 'es': arguments[4],
'es': arguments[5], 'fr': arguments[5],
'fr': arguments[6], 'he': arguments[6],
'he': arguments[7], 'hu': arguments[7],
'hu': arguments[8], 'id': arguments[8],
'id': arguments[9], 'it': arguments[9],
'it': arguments[10], 'ja': arguments[10],
'ja': arguments[11], 'nb': arguments[11],
'nb': arguments[12], 'nl': arguments[12],
'nl': arguments[13], 'pl': arguments[13],
'pl': arguments[14], 'pt-br': arguments[14],
'pt-br': arguments[15], 'ru': arguments[15],
'ru': arguments[16], 'uk': arguments[16],
'uk': arguments[17], 'zh': arguments[17]
'zh': arguments[18]
}; };
return root.locales; return root.locales;
}); });
......
...@@ -144,15 +144,10 @@ ...@@ -144,15 +144,10 @@
// Translation machinery // Translation machinery
// --------------------- // ---------------------
__: function (str) { __: function (str) {
if (typeof Jed === "undefined") { if (typeof Jed === "undefined" || _.isUndefined(this.i18n) || this.i18n === 'en') {
return str; return str;
} }
// FIXME: this can be refactored to take the i18n obj as a
// parameter.
// Translation factory // Translation factory
if (typeof this.i18n === "undefined") {
this.i18n = locales.en;
}
if (typeof this.i18n === "string") { if (typeof this.i18n === "string") {
this.i18n = window.JSON.parse(this.i18n); this.i18n = window.JSON.parse(this.i18n);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment