mirror/spacedeck-open
1
0
Fork 0
mirror of https://github.com/spacedeck/spacedeck-open.git synced 2025-12-15 17:37:30 +01:00
Code Issues Projects Releases Wiki Activity

fix user locale handling (#190)

Browse Source 
* fix some french translations
add more translations
fix langage preference setup

* handle i18n for delete space or folder

* fix content layout for help text
This commit is contained in:
Romuald
2021-05-18 17:12:15 +02:00
committed by GitHub
parent 3dd0fce139
commit 601211e294
7 changed files with 73 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
public/javascripts/spacedeck_spaces.js
View File

@@ -418,7 +418,7 @@ var SpacedeckSpaces = {
if (!space_type) space_type = "space";
var s = {
name: space_type == "space" ? __("untitled_space") : __("untitled_folder") ,
name: space_type == "space" ? __("untitled_space") : __("untitled_folder"),
artifacts: [],
space_type: space_type,
parent_space_id: this.active_folder._id
@@ -487,7 +487,7 @@ var SpacedeckSpaces = {
},
delete_space: function(space) {
smoke.confirm("Really delete "+space.name+"?", function(confirmed) {
smoke.confirm(__("tool_delete_space", space.name), function(confirmed) {
if (!confirmed) return;
var idx = this.active_folder.children.indexOf(space);
@@ -502,7 +502,7 @@ var SpacedeckSpaces = {
this.active_folder.children.splice(idx,1);
}.bind(this));
}.bind(this));
}.bind(this), {ok: __("ok"), cancel: __("cancel")});
},
duplicate_space: function(space) {
@@ -528,7 +528,7 @@ var SpacedeckSpaces = {
space.name = title;
save_space(space);
}
}.bind(this), {value: space.name});
}.bind(this), {value: space.name, ok: __("ok"), cancel: __("cancel")});
},
rename_folder: function(folder) {
@@ -539,7 +539,7 @@ var SpacedeckSpaces = {
folder.name = title;
save_space(folder);
}
}.bind(this), {value: folder.name});
}.bind(this), {value: folder.name, ok: __("ok"), cancel: __("cancel")});
},
edit_space_title: function() {

14
public/javascripts/spacedeck_vue.js
View File

@@ -121,20 +121,26 @@ function boot_spacedeck() {
var lang = "en";
window.refreshLocale = function() {
if (spacedeck && spacedeck.user && spacedeck.user.preferences) {
lang = spacedeck.user.preferences.language || "en";
var old_lang = lang;
if (spacedeck && spacedeck.user && spacedeck.user.prefs_language) {
lang = spacedeck.user.prefs_language || "en";
} else if (window.browser_lang) {
lang = window.browser_lang;
}
if (lang != old_lang) {
i18n.init({ lng: lang, resStore: window.locales }, function(err, t) {
console.log("i18n initialized: "+lang);
});
}
}
window.refreshLocale();
i18n.init({ lng: lang, resStore: window.locales }, function(err, t) {
console.log("i18n initialized: "+lang);
});
window.__ = function() {
window.__ = function() {
var params = Array.prototype.slice.call(arguments);
params.shift();
window.refreshLocale();