IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: allow for empty translated strings

Browse Source
This commit is contained in:
Régis Hanol 2017-03-01 11:30:44 +01:00
parent e27b1b98d1
commit b20b568039
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/locales/i18n.js
View File

@ -73,7 +73,13 @@ I18n.lookup = function(scope, options) {
messages = messages[currentScope]; messages = messages[currentScope];
} }
messages = messages || checkExtras(origScope, this.SEPARATOR, this.extras) || options.defaultValue; if (messages === undefined) {
messages = checkExtras(origScope, this.SEPARATOR, this.extras);
}
if (messages === undefined) {
messages = options.defaultValue;
}
return messages; return messages;
}; };

4
test/javascripts/lib/i18n-test.js.es6
View File

@ -27,7 +27,8 @@ module("lib:i18n", {
"en": { "en": {
"js": { "js": {
"hello": { "hello": {
"world": "Hello World!" "world": "Hello World!",
"universe": ""
}, },
"topic": { "topic": {
"reply": { "reply": {
@ -68,6 +69,7 @@ test("translations", function() {
equal(I18n.t("topic.reply.title"), "Répondre", "uses locale translations when they exist"); equal(I18n.t("topic.reply.title"), "Répondre", "uses locale translations when they exist");
equal(I18n.t("topic.reply.help"), "begin composing a reply to this topic", "fallbacks to English translations"); equal(I18n.t("topic.reply.help"), "begin composing a reply to this topic", "fallbacks to English translations");
equal(I18n.t("hello.world"), "Hello World!", "doesn't break if a key is overriden in a locale"); equal(I18n.t("hello.world"), "Hello World!", "doesn't break if a key is overriden in a locale");
equal(I18n.t("hello.universe"), "", "allows empty strings");
}); });
test("extra translations", function() { test("extra translations", function() {