[tuxdroid-svn] r5062 - in software_suite_v3/smart-core/smart-server/trunk: resources/07_web_interf
Status: Beta
Brought to you by:
ks156
Menu
▾
▴
[tuxdroid-svn] r5062 - in software_suite_v3/smart-core/smart-server/trunk: resources/07_web_interfaces translation/wi_user
|
From: remi <c2m...@c2...> - 2009-07-06 08:43:42
|
Author: remi
Date: 2009-07-06 10:43:28 +0200 (Mon, 06 Jul 2009)
New Revision: 5062
Modified:
software_suite_v3/smart-core/smart-server/trunk/resources/07_web_interfaces/01_resourceWIUser01.py
software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/default.pot
software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/en.po
software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/fr.po
Log:
* Auto-selection of the user interface language.
* Fixed encoding and file format of interface translations.
Modified: software_suite_v3/smart-core/smart-server/trunk/resources/07_web_interfaces/01_resourceWIUser01.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/resources/07_web_interfaces/01_resourceWIUser01.py 2009-07-06 07:50:13 UTC (rev 5061)
+++ software_suite_v3/smart-core/smart-server/trunk/resources/07_web_interfaces/01_resourceWIUser01.py 2009-07-06 08:43:28 UTC (rev 5062)
@@ -3,11 +3,7 @@
# ==============================================================================
from translation.Translation import Translation
-from util.misc.tuxPaths import TUXDROID_LANGUAGE
-splitedLC = TUXDROID_LANGUAGE.split("_")
-GUI_LANGUAGE = str(splitedLC[0])
-
# ------------------------------------------------------------------------------
# Declaration of the resource "wi_user_01".
# ------------------------------------------------------------------------------
@@ -131,7 +127,7 @@
headersStruct = self.getDefaultHeadersStruct()
contentStruct = self.getDefaultContentStruct()
contentStruct['root']['result'] = getStrError(E_TDREST_SUCCESS)
- language = parameters['language']
+ language = str(resourceUsers.getCurrentUserConfiguration()['language1'])
skin = parameters['skin']
menu = parameters['menu']
contentStruct['root']['data'] = {}
@@ -146,9 +142,10 @@
# Register the service into the resource
resourceWIUser01.addService(TDSServiceWIUser01Index)
# Bind the resource index url to this service
-paramsString = "skin=user_01&language=%s&menu=livewithtux" % GUI_LANGUAGE
-resourcesManager.addBinding("user", "wi_user_01", "index", paramsString)
-resourcesManager.addBinding("user/index", "wi_user_01", "index", paramsString)
+resourcesManager.addBinding("user", "wi_user_01", "index",
+ "skin=user_01&language=en&menu=livewithtux")
+resourcesManager.addBinding("user/index", "wi_user_01", "index",
+ "skin=user_01&language=en&menu=livewithtux")
# ------------------------------------------------------------------------------
# Declaration of the service "live_with_tux".
Modified: software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/default.pot
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/default.pot 2009-07-06 07:50:13 UTC (rev 5061)
+++ software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/default.pot 2009-07-06 08:43:28 UTC (rev 5062)
@@ -1,152 +1,152 @@
-msgid "live_with_tux"
-msgstr ""
-
-msgid "gadgets"
-msgstr ""
-
-msgid "attitunes"
-msgstr ""
-
-msgid "tools"
-msgstr ""
-
-msgid "online"
-msgstr ""
-
-msgid "status"
-msgstr ""
-
-msgid "sound_on"
-msgstr ""
-
-msgid "sound_off"
-msgstr ""
-
-msgid "start"
-msgstr ""
-
-msgid "stop"
-msgstr ""
-
-msgid "all"
-msgstr ""
-
-msgid "on_demand"
-msgstr ""
-
-msgid "alerts"
-msgstr ""
-
-msgid "delete"
-msgstr ""
-
-msgid "popup_not_yet_implemented"
-msgstr ""
-
-msgid "popup_confirm_delete_gadget"
-msgstr ""
-
-msgid "yes"
-msgstr ""
-
-msgid "no"
-msgstr ""
-
-msgid "close"
-msgstr ""
-
-msgid "apply"
-msgstr ""
-
-msgid "cancel"
-msgstr ""
-
-msgid "gadget_settings"
-msgstr ""
-
-msgid "gadget_name"
-msgstr ""
-
-msgid "my_use_of_the_gadget"
-msgstr ""
-
-msgid "on_demand_description"
-msgstr ""
-
-msgid "date"
-msgstr ""
-
-msgid "starting_at"
-msgstr ""
-
-msgid "stopping_at"
-msgstr ""
-
-msgid "delay"
-msgstr ""
-
-msgid "my_week"
-msgstr ""
-
-msgid "all_days"
-msgstr ""
-
-msgid "working_days"
-msgstr ""
-
-msgid "weekend"
-msgstr ""
-
-msgid "monday"
-msgstr ""
-
-msgid "tuesday"
-msgstr ""
-
-msgid "wednesday"
-msgstr ""
-
-msgid "thursday"
-msgstr ""
-
-msgid "friday"
-msgstr ""
-
-msgid "saturday"
-msgstr ""
-
-msgid "sunday"
-msgstr ""
-
-msgid "quart_hours"
-msgstr ""
-
-msgid "half_hours"
-msgstr ""
-
-msgid "full_hours"
-msgstr ""
-
-msgid "crazy"
-msgstr ""
-
-msgid "often"
-msgstr ""
-
-msgid "normal"
-msgstr ""
-
-msgid "rarely"
-msgstr ""
-
-msgid "show"
-msgstr ""
-
-msgid "online_documentation"
-msgstr ""
-
-msgid "documentation_url"
-msgstr ""
-
-msgid "global_settings"
-msgstr ""
+msgid "live_with_tux"
+msgstr ""
+
+msgid "gadgets"
+msgstr ""
+
+msgid "attitunes"
+msgstr ""
+
+msgid "tools"
+msgstr ""
+
+msgid "online"
+msgstr ""
+
+msgid "status"
+msgstr ""
+
+msgid "sound_on"
+msgstr ""
+
+msgid "sound_off"
+msgstr ""
+
+msgid "start"
+msgstr ""
+
+msgid "stop"
+msgstr ""
+
+msgid "all"
+msgstr ""
+
+msgid "on_demand"
+msgstr ""
+
+msgid "alerts"
+msgstr ""
+
+msgid "delete"
+msgstr ""
+
+msgid "popup_not_yet_implemented"
+msgstr ""
+
+msgid "popup_confirm_delete_gadget"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "close"
+msgstr ""
+
+msgid "apply"
+msgstr ""
+
+msgid "cancel"
+msgstr ""
+
+msgid "gadget_settings"
+msgstr ""
+
+msgid "gadget_name"
+msgstr ""
+
+msgid "my_use_of_the_gadget"
+msgstr ""
+
+msgid "on_demand_description"
+msgstr ""
+
+msgid "date"
+msgstr ""
+
+msgid "starting_at"
+msgstr ""
+
+msgid "stopping_at"
+msgstr ""
+
+msgid "delay"
+msgstr ""
+
+msgid "my_week"
+msgstr ""
+
+msgid "all_days"
+msgstr ""
+
+msgid "working_days"
+msgstr ""
+
+msgid "weekend"
+msgstr ""
+
+msgid "monday"
+msgstr ""
+
+msgid "tuesday"
+msgstr ""
+
+msgid "wednesday"
+msgstr ""
+
+msgid "thursday"
+msgstr ""
+
+msgid "friday"
+msgstr ""
+
+msgid "saturday"
+msgstr ""
+
+msgid "sunday"
+msgstr ""
+
+msgid "quart_hours"
+msgstr ""
+
+msgid "half_hours"
+msgstr ""
+
+msgid "full_hours"
+msgstr ""
+
+msgid "crazy"
+msgstr ""
+
+msgid "often"
+msgstr ""
+
+msgid "normal"
+msgstr ""
+
+msgid "rarely"
+msgstr ""
+
+msgid "show"
+msgstr ""
+
+msgid "online_documentation"
+msgstr ""
+
+msgid "documentation_url"
+msgstr ""
+
+msgid "global_settings"
+msgstr ""
Modified: software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/en.po
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/en.po 2009-07-06 07:50:13 UTC (rev 5061)
+++ software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/en.po 2009-07-06 08:43:28 UTC (rev 5062)
@@ -1,152 +1,152 @@
-msgid "live_with_tux"
-msgstr "Live with Tux"
-
-msgid "gadgets"
-msgstr "Gadgets"
-
-msgid "attitunes"
-msgstr "Attitunes"
-
-msgid "tools"
-msgstr "Tools"
-
-msgid "online"
-msgstr "Online"
-
-msgid "status"
-msgstr "Status"
-
-msgid "sound_on"
-msgstr "Sound on"
-
-msgid "sound_off"
-msgstr "Sound off"
-
-msgid "start"
-msgstr "Start"
-
-msgid "stop"
-msgstr "Stop"
-
-msgid "all"
-msgstr "All"
-
-msgid "on_demand"
-msgstr "On demand"
-
-msgid "alerts"
-msgstr "Alerts"
-
-msgid "delete"
-msgstr "Delete"
-
-msgid "popup_not_yet_implemented"
-msgstr "This functionality is not yet implemented."
-
-msgid "popup_confirm_delete_gadget"
-msgstr "This action will delete this gadget. Continue ?"
-
-msgid "yes"
-msgstr "Yes"
-
-msgid "no"
-msgstr "No"
-
-msgid "close"
-msgstr "Close"
-
-msgid "apply"
-msgstr "Apply"
-
-msgid "cancel"
-msgstr "Cancel"
-
-msgid "gadget_settings"
-msgstr "Gadget settings"
-
-msgid "gadget_name"
-msgstr "Gadget name"
-
-msgid "my_use_of_the_gadget"
-msgstr "My use of the gadget"
-
-msgid "on_demand_description"
-msgstr "This gadget will be accessible with the remote control."
-
-msgid "date"
-msgstr "Date"
-
-msgid "starting_at"
-msgstr "Starting at"
-
-msgid "stopping_at"
-msgstr "Stopping at"
-
-msgid "delay"
-msgstr "Frequency"
-
-msgid "my_week"
-msgstr "My week"
-
-msgid "all_days"
-msgstr "All days"
-
-msgid "working_days"
-msgstr "Working days"
-
-msgid "weekend"
-msgstr "Weekend"
-
-msgid "monday"
-msgstr "Monday"
-
-msgid "tuesday"
-msgstr "Tuesday"
-
-msgid "wednesday"
-msgstr "Wednesday"
-
-msgid "thursday"
-msgstr "Thursday"
-
-msgid "friday"
-msgstr "Friday"
-
-msgid "saturday"
-msgstr "Saturday"
-
-msgid "sunday"
-msgstr "Sunday"
-
-msgid "quart_hours"
-msgstr "Quarter hours"
-
-msgid "half_hours"
-msgstr "Half hours"
-
-msgid "full_hours"
-msgstr "Full hours"
-
-msgid "crazy"
-msgstr "Crazy"
-
-msgid "often"
-msgstr "Often"
-
-msgid "normal"
-msgstr "Normal"
-
-msgid "rarely"
-msgstr "Rarely"
-
-msgid "show"
-msgstr "Show"
-
-msgid "online_documentation"
-msgstr "Online documentation"
-
-msgid "documentation_url"
-msgstr "http://www.kysoh.com/documentation-3?set_language=en"
-
-msgid "global_settings"
-msgstr "Global settings"
+msgid "live_with_tux"
+msgstr "Live with Tux"
+
+msgid "gadgets"
+msgstr "Gadgets"
+
+msgid "attitunes"
+msgstr "Attitunes"
+
+msgid "tools"
+msgstr "Tools"
+
+msgid "online"
+msgstr "Online"
+
+msgid "status"
+msgstr "Status"
+
+msgid "sound_on"
+msgstr "Sound on"
+
+msgid "sound_off"
+msgstr "Sound off"
+
+msgid "start"
+msgstr "Start"
+
+msgid "stop"
+msgstr "Stop"
+
+msgid "all"
+msgstr "All"
+
+msgid "on_demand"
+msgstr "On demand"
+
+msgid "alerts"
+msgstr "Alerts"
+
+msgid "delete"
+msgstr "Delete"
+
+msgid "popup_not_yet_implemented"
+msgstr "This functionality is not yet implemented."
+
+msgid "popup_confirm_delete_gadget"
+msgstr "This action will delete this gadget. Continue ?"
+
+msgid "yes"
+msgstr "Yes"
+
+msgid "no"
+msgstr "No"
+
+msgid "close"
+msgstr "Close"
+
+msgid "apply"
+msgstr "Apply"
+
+msgid "cancel"
+msgstr "Cancel"
+
+msgid "gadget_settings"
+msgstr "Gadget settings"
+
+msgid "gadget_name"
+msgstr "Gadget name"
+
+msgid "my_use_of_the_gadget"
+msgstr "My use of the gadget"
+
+msgid "on_demand_description"
+msgstr "This gadget will be accessible with the remote control."
+
+msgid "date"
+msgstr "Date"
+
+msgid "starting_at"
+msgstr "Starting at"
+
+msgid "stopping_at"
+msgstr "Stopping at"
+
+msgid "delay"
+msgstr "Frequency"
+
+msgid "my_week"
+msgstr "My week"
+
+msgid "all_days"
+msgstr "All days"
+
+msgid "working_days"
+msgstr "Working days"
+
+msgid "weekend"
+msgstr "Weekend"
+
+msgid "monday"
+msgstr "Monday"
+
+msgid "tuesday"
+msgstr "Tuesday"
+
+msgid "wednesday"
+msgstr "Wednesday"
+
+msgid "thursday"
+msgstr "Thursday"
+
+msgid "friday"
+msgstr "Friday"
+
+msgid "saturday"
+msgstr "Saturday"
+
+msgid "sunday"
+msgstr "Sunday"
+
+msgid "quart_hours"
+msgstr "Quarter hours"
+
+msgid "half_hours"
+msgstr "Half hours"
+
+msgid "full_hours"
+msgstr "Full hours"
+
+msgid "crazy"
+msgstr "Crazy"
+
+msgid "often"
+msgstr "Often"
+
+msgid "normal"
+msgstr "Normal"
+
+msgid "rarely"
+msgstr "Rarely"
+
+msgid "show"
+msgstr "Show"
+
+msgid "online_documentation"
+msgstr "Online documentation"
+
+msgid "documentation_url"
+msgstr "http://www.kysoh.com/documentation-3?set_language=en"
+
+msgid "global_settings"
+msgstr "Global settings"
Modified: software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/fr.po
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/fr.po 2009-07-06 07:50:13 UTC (rev 5061)
+++ software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/fr.po 2009-07-06 08:43:28 UTC (rev 5062)
@@ -1,152 +1,152 @@
-msgid "live_with_tux"
-msgstr "Vivre avec Tux"
-
-msgid "gadgets"
-msgstr "Gadgets"
-
-msgid "attitunes"
-msgstr "Attitunes"
-
-msgid "tools"
-msgstr "Outils"
-
-msgid "online"
-msgstr "En ligne"
-
-msgid "status"
-msgstr "Statut"
-
-msgid "sound_on"
-msgstr "Son on"
-
-msgid "sound_off"
-msgstr "Son off"
-
-msgid "start"
-msgstr "Start"
-
-msgid "stop"
-msgstr "Stop"
-
-msgid "all"
-msgstr "Tous"
-
-msgid "on_demand"
-msgstr "A la demande"
-
-msgid "alerts"
-msgstr "Alertes"
-
-msgid "delete"
-msgstr "Suppr."
-
-msgid "popup_not_yet_implemented"
-msgstr "Cette fonctionnalité n'est pas encore implémentée."
-
-msgid "popup_confirm_delete_gadget"
-msgstr "Etes-vous sûr de vouloir supprimer ce gadget ?"
-
-msgid "yes"
-msgstr "Oui"
-
-msgid "no"
-msgstr "Non"
-
-msgid "close"
-msgstr "Fermer"
-
-msgid "apply"
-msgstr "Valider"
-
-msgid "cancel"
-msgstr "Annuler"
-
-msgid "gadget_settings"
-msgstr "Paramètres du gadget"
-
-msgid "gadget_name"
-msgstr "Nom du gadget"
-
-msgid "my_use_of_the_gadget"
-msgstr "Mon utilisation du gadget"
-
-msgid "on_demand_description"
-msgstr "Ce gadget sera accessible avec la télécommande."
-
-msgid "date"
-msgstr "Date"
-
-msgid "starting_at"
-msgstr "Démarrer à"
-
-msgid "stopping_at"
-msgstr "Stopper à"
-
-msgid "delay"
-msgstr "Fréquence"
-
-msgid "my_week"
-msgstr "Ma semaine"
-
-msgid "all_days"
-msgstr "Tous les jours"
-
-msgid "working_days"
-msgstr "Les jours ouvrables"
-
-msgid "weekend"
-msgstr "Le weekend"
-
-msgid "monday"
-msgstr "Lundi"
-
-msgid "tuesday"
-msgstr "Mardi"
-
-msgid "wednesday"
-msgstr "Mercredi"
-
-msgid "thursday"
-msgstr "Jeudi"
-
-msgid "friday"
-msgstr "Vendredi"
-
-msgid "saturday"
-msgstr "Samedi"
-
-msgid "sunday"
-msgstr "Dimanche"
-
-msgid "quart_hours"
-msgstr "Quart d'heures"
-
-msgid "half_hours"
-msgstr "Demi-heures"
-
-msgid "full_hours"
-msgstr "Heures pleines"
-
-msgid "crazy"
-msgstr "Fou"
-
-msgid "often"
-msgstr "Souvent"
-
-msgid "normal"
-msgstr "Normal"
-
-msgid "rarely"
-msgstr "Rarement"
-
-msgid "show"
-msgstr "Voir"
-
-msgid "online_documentation"
-msgstr "Documentation en ligne"
-
-msgid "documentation_url"
-msgstr "http://www.kysoh.com/documentation-3?set_language=fr"
-
-msgid "global_settings"
-msgstr "Configuration globale"
+msgid "live_with_tux"
+msgstr "Vivre avec Tux"
+
+msgid "gadgets"
+msgstr "Gadgets"
+
+msgid "attitunes"
+msgstr "Attitunes"
+
+msgid "tools"
+msgstr "Outils"
+
+msgid "online"
+msgstr "En ligne"
+
+msgid "status"
+msgstr "Statut"
+
+msgid "sound_on"
+msgstr "Son on"
+
+msgid "sound_off"
+msgstr "Son off"
+
+msgid "start"
+msgstr "Start"
+
+msgid "stop"
+msgstr "Stop"
+
+msgid "all"
+msgstr "Tous"
+
+msgid "on_demand"
+msgstr "A la demande"
+
+msgid "alerts"
+msgstr "Alertes"
+
+msgid "delete"
+msgstr "Suppr."
+
+msgid "popup_not_yet_implemented"
+msgstr "Cette fonctionnalité n'est pas encore implémentée."
+
+msgid "popup_confirm_delete_gadget"
+msgstr "Etes-vous sûr de vouloir supprimer ce gadget ?"
+
+msgid "yes"
+msgstr "Oui"
+
+msgid "no"
+msgstr "Non"
+
+msgid "close"
+msgstr "Fermer"
+
+msgid "apply"
+msgstr "Valider"
+
+msgid "cancel"
+msgstr "Annuler"
+
+msgid "gadget_settings"
+msgstr "Paramètres du gadget"
+
+msgid "gadget_name"
+msgstr "Nom du gadget"
+
+msgid "my_use_of_the_gadget"
+msgstr "Mon utilisation du gadget"
+
+msgid "on_demand_description"
+msgstr "Ce gadget sera accessible avec la télécommande."
+
+msgid "date"
+msgstr "Date"
+
+msgid "starting_at"
+msgstr "Démarrer à"
+
+msgid "stopping_at"
+msgstr "Stopper à"
+
+msgid "delay"
+msgstr "Fréquence"
+
+msgid "my_week"
+msgstr "Ma semaine"
+
+msgid "all_days"
+msgstr "Tous les jours"
+
+msgid "working_days"
+msgstr "Les jours ouvrables"
+
+msgid "weekend"
+msgstr "Le weekend"
+
+msgid "monday"
+msgstr "Lundi"
+
+msgid "tuesday"
+msgstr "Mardi"
+
+msgid "wednesday"
+msgstr "Mercredi"
+
+msgid "thursday"
+msgstr "Jeudi"
+
+msgid "friday"
+msgstr "Vendredi"
+
+msgid "saturday"
+msgstr "Samedi"
+
+msgid "sunday"
+msgstr "Dimanche"
+
+msgid "quart_hours"
+msgstr "Quart d'heures"
+
+msgid "half_hours"
+msgstr "Demi-heures"
+
+msgid "full_hours"
+msgstr "Heures pleines"
+
+msgid "crazy"
+msgstr "Fou"
+
+msgid "often"
+msgstr "Souvent"
+
+msgid "normal"
+msgstr "Normal"
+
+msgid "rarely"
+msgstr "Rarement"
+
+msgid "show"
+msgstr "Voir"
+
+msgid "online_documentation"
+msgstr "Documentation en ligne"
+
+msgid "documentation_url"
+msgstr "http://www.kysoh.com/documentation-3?set_language=fr"
+
+msgid "global_settings"
+msgstr "Configuration globale"
|
