kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-18 19:37:12 +00:00
Code Issues Projects Releases Wiki Activity

Upgraded gettext/gettext (+ JS-Translator)

Browse Source
This commit is contained in:
Bernd Bestel
2021-07-04 20:58:24 +02:00
parent 54d4c90ec4
commit 9abb92763d
7 changed files with 179 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
public/js/grocy.js
View File

@@ -231,11 +231,11 @@ U = function(relativePath)
return Grocy.BaseUrl.replace(/\/$/, '') + relativePath;
}
Grocy.Translator = new Translator(); // Dummy, real instance is loaded async below
Grocy.Translator = new window.translator.default(); // Dummy, real instance is loaded async below
Grocy.Api.Get("system/localization-strings?v=" + Grocy.Version,
function(response)
{
Grocy.Translator = new Translator(response);
Grocy.Translator = new window.translator.default(response);
},
function(xhr)
{
@@ -250,7 +250,7 @@ __t = function(text, ...placeholderValues)
Grocy.Api.Post('system/log-missing-localization', { "text": text2 });
}
return Grocy.Translator.__(text, ...placeholderValues)
return Grocy.Translator.gettext(text, ...placeholderValues);
}
__n = function(number, singularForm, pluralForm)
{
@@ -260,7 +260,7 @@ __n = function(number, singularForm, pluralForm)
Grocy.Api.Post('system/log-missing-localization', { "text": singularForm2 });
}
return Grocy.Translator.n__(singularForm, pluralForm, number, number)
return Grocy.Translator.ngettext(singularForm, pluralForm, number, number);
}
if (!Grocy.ActiveNav.isEmpty())