Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

馃悶 dynamic translation issues #327

Merged
merged 3 commits into from Jul 18, 2023
Merged

馃悶 dynamic translation issues #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3535504
wip
Findeton Jul 18, 2023
d5432eb
wip
Findeton Jul 18, 2023
64cf814
wip
Findeton Jul 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
42 changes: 18 additions & 24 deletions avUi/i18n-override-service.js
View file
Open in desktop
Expand Up @@ -56,36 +56,30 @@ angular
// load i18n_overrides if any
if (performOverrides)
{
$window.i18n.preload(
_.keys($window.i18nOverride),
function ()
_.map(
$window.i18nOverride,
function (i18nOverride, language)
{
_.map(
$window.i18nOverride,
function (i18nOverride, language)
{
$window.i18n.addResources(
/* lng = */ language,
/* ns = */ "translation",
/* resources = */ i18nOverride
);
$window.i18n.addResources(
/* lng = */ language,
/* ns = */ "translation",
/* resources = */ i18nOverride
);

// force-refresh cached translations to override
_.each(
_.keys(i18nOverride),
function (i18nString)
{
$i18next(i18nString, {});
}
);
// force-refresh cached translations to override
_.each(
_.keys(i18nOverride),
function (i18nString)
{
$i18next(i18nString, {});
}
);
$rootScope.$broadcast(
'i18nextLanguageChange',
$window.i18n.lng()
);
}
);
$rootScope.$broadcast(
'i18nextLanguageChange',
$window.i18n.lng()
);
}
};
}
Expand Down
12 changes: 5 additions & 7 deletions dist/appCommon-vmaster.js
View file
Open in desktop
Expand Up @@ -1094,13 +1094,11 @@ angular.module("avRegistration").config(function() {}), angular.module("avRegist
force = !!angular.isDefined(force) && force;
var performOverrides = !1;
(overrides = null === overrides ? $window.i18nOverride : overrides) && (performOverrides = force || JSON.stringify(overrides) !== JSON.stringify($window.i18nOverride),
$window.i18nOverride = overrides), performOverrides && $window.i18n.preload(_.keys($window.i18nOverride), function() {
_.map($window.i18nOverride, function(i18nOverride, language) {
$window.i18n.addResources(language, "translation", i18nOverride), _.each(_.keys(i18nOverride), function(i18nString) {
$i18next(i18nString, {});
});
}), $rootScope.$broadcast("i18nextLanguageChange", $window.i18n.lng());
});
$window.i18nOverride = overrides), performOverrides && (_.map($window.i18nOverride, function(i18nOverride, language) {
$window.i18n.addResources(language, "translation", i18nOverride), _.each(_.keys(i18nOverride), function(i18nString) {
$i18next(i18nString, {});
});
}), $rootScope.$broadcast("i18nextLanguageChange", $window.i18n.lng()));
};
} ]), angular.module("avUi").directive("avChangeLang", [ "$i18next", "ipCookie", "angularLoad", "amMoment", "ConfigService", "$window", "I18nOverride", function($i18next, ipCookie, angularLoad, amMoment, ConfigService, $window, I18nOverride) {
return {
Expand Down