Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixes #3846 - Simple quote characters (') not properly displayed.

Browse source
This commit is contained in:
Dominik Klein 2021-11-22 13:36:57 +01:00 committed by Rolf Schmidt
parent 059e2f90e4
commit e4a14268d6
3 changed files with 32 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/controllers/_ui_element/basedate.coffee
View file

@ -155,4 +155,4 @@ class App.UiElement.basedate
clear: __('clear') clear: __('clear')
} }
App.i18n.translateDeep(data) App.i18n.translateDeepPlain(data)

18
app/assets/javascripts/app/lib/app_post/i18n.coffee
View file

@ -8,7 +8,12 @@ class App.i18n
@translateDeep: (input, args...) -> @translateDeep: (input, args...) ->
if _instance == undefined if _instance == undefined
_instance ?= new _i18nSingleton() _instance ?= new _i18nSingleton()
_instance.translateDeep(input, args) _instance.translateDeep(input, args, false)
@translateDeepPlain: (input, args...) ->
if _instance == undefined
_instance ?= new _i18nSingleton()
_instance.translateDeep(input, args, true)
@translateContent: (string, args...) -> @translateContent: (string, args...) ->
if _instance == undefined if _instance == undefined
@ -205,17 +210,20 @@ class _i18nSingleton extends Spine.Module
return string if !string return string if !string
@translate(string, args, true) @translate(string, args, true)
translateDeep: (input, args) => translateDeep: (input, args, plain) =>
if _.isArray(input) if _.isArray(input)
_.map input, (item) => _.map input, (item) =>
@translateDeep(item, args) @translateDeep(item, args, plain)
else if _.isObject(input) else if _.isObject(input)
_.reduce _.keys(input), (memo, item) => _.reduce _.keys(input), (memo, item) =>
memo[item] = @translateDeep(input[item]) memo[item] = @translateDeep(input[item], args, plain)
memo memo
, {} , {}
else else
@translateInline(input, args) if plain
@translatePlain(input, args)
else
@translateInline(input, args)
translateContent: (string, args) => translateContent: (string, args) =>

18
public/assets/tests/qunit/i18n.js
View file

@ -71,6 +71,24 @@ QUnit.test('i18n', assert => {
translated = App.i18n.translateInline('yes') translated = App.i18n.translateInline('yes')
assert.equal(translated, 'ja', 'de-de - yes / ja translated correctly') assert.equal(translated, 'ja', 'de-de - yes / ja translated correctly')
translated = App.i18n.translateDeep({
days: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
today: 'today',
})
assert.deepEqual(translated, {
days: ['Sonntag', 'Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag'],
today: 'Heute',
}, 'de-de - deep object/array translated correctly')
translated = App.i18n.translateDeepPlain({
days: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
today: 'today',
})
assert.deepEqual(translated, {
days: ['Sonntag', 'Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag'],
today: 'Heute',
}, 'de-de - deep object/array translated correctly')
translated = App.i18n.translateContent('%s ago', 123); translated = App.i18n.translateContent('%s ago', 123);
assert.equal(translated, 'vor 123', 'de-de - %s') assert.equal(translated, 'vor 123', 'de-de - %s')