mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-06-06 20:19:13 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #35278 -- Refactored and functions to use helper function with extracted common logic.

Browse Source
This commit is contained in:
Piotr Kawula 2024-03-07 12:34:28 +01:00
parent 54fa8b5693
commit c39c7133a0
1 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
django/views/templates/i18n_catalog.js
View File

@ -27,38 +27,40 @@
} }
{% endif %} {% endif %}
function getValueFromCatalog(msgid, index) {
const value = django.catalog[msgid];
// if value in catalog is a string, return it
if (typeof value === 'string' && value) {
return value;
}
// if value in catalog is an array and index is present, return the array index if exists
if (value && value.constructor === Array && index != undefined) {
const text = value[index];
if (typeof text === 'string' && text) {
return text;
}
}
return undefined;
}
if (!django.jsi18n_initialized) { if (!django.jsi18n_initialized) {
django.gettext = function(msgid) { django.gettext = function(msgid) {
const value = django.catalog[msgid]; const value = getValueFromCatalog(msgid, 0);
if (typeof value === 'undefined') {
return msgid;
} else {
if (typeof value === 'string') {
return value;
}
const text = value[0]; return value !== undefined ? value : msgid;
return typeof text === 'string' ? text : msgid;
}
}; };
django.ngettext = function(singular, plural, count) { django.ngettext = function(singular, plural, count) {
const value = django.catalog[singular]; const value = getValueFromCatalog(singular, django.pluralidx(count));
if (typeof value === 'undefined') {
return (count == 1) ? singular : plural;
} else {
if (value.constructor === Array) {
const text = value[django.pluralidx(count)];
if (typeof text === 'undefined') {
return (count == 1) ? singular : plural;
} else {
return text;
}
}
if (value !== undefined) {
return value; return value;
} else {
return (count == 1) ? singular : plural;
} }
}; };