From d5aa10143a0e6457b3326ba839c81b7c956a015e Mon Sep 17 00:00:00 2001
From: Ramzi Ramey <ramzi@lindenlab.com>
Date: Mon, 27 Jul 2009 22:43:43 +0000
Subject: DEV-36783 I18N: important .on_click and .on_enable widgets are
missing a name= parameter. This breaks localization. Fixed in en and fr (as
1 test case)
---
indra/newview/skins/default/xui/en/menu_viewer.xml | 11 +++++++++++
indra/newview/skins/default/xui/fr/menu_viewer.xml | 16 +++++++++-------
2 files changed, 20 insertions(+), 7 deletions(-)
(limited to 'indra/newview')
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 23ba2b6281..e922e3b743 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -31,6 +31,7 @@
name="Account History">
<menu_item_call.on_click
function="PromptShowURL"
+ name="AccountHistory_url"
parameter="WebLaunchAccountHistory,http://secondlife.com/account/transactions.php" />
</menu_item_call>
<menu_item_call
@@ -39,6 +40,7 @@
name="Manage My Account">
<menu_item_call.on_click
function="PromptShowURL"
+ name="ManageMyAccount_url"
parameter="WebLaunchJoinNow,http://secondlife.com/account/" />
</menu_item_call>
<menu_item_separator
@@ -423,6 +425,7 @@
name="ReportBug">
<menu_item_call.on_click
function="PromptShowURL"
+ name="ReportBug_url"
parameter="hud,http://help.secondlife.com/en/bugreport/" />
</menu_item_call>
<menu_item_call
@@ -838,6 +841,7 @@
function="Tools.BuyOrTake" />
<menu_item_call.on_enable
function="Tools.EnableBuyOrTake"
+ name="EnableBuyOrTake"
parameter="Buy,Take" />
</menu_item_call>
<menu_item_call
@@ -3507,6 +3511,7 @@
name="Official Linden Blog">
<menu_item_call.on_click
function="PromptShowURL"
+ name="OfficialLindenBlog_url"
parameter="WebLaunchSupportWiki,http://blog.secondlife.com/" />
</menu_item_call>
<menu_item_call
@@ -3515,6 +3520,7 @@
name="Scripting Portal">
<menu_item_call.on_click
function="PromptShowURL"
+ name="ScriptingPortal_url"
parameter="WebLaunchLSLWiki,http://wiki.secondlife.com/wiki/LSL_Portal" />
</menu_item_call>
<menu
@@ -3529,6 +3535,7 @@
name="Public Issue Tracker">
<menu_item_call.on_click
function="PromptShowURL"
+ name="PublicIssueTracker_url"
parameter="WebLaunchPublicIssue,http://jira.secondlife.com" />
</menu_item_call>
<menu_item_call
@@ -3537,6 +3544,7 @@
name="Publc Issue Tracker Help">
<menu_item_call.on_click
function="PromptShowURL"
+ name="PublicIssueTrackerHelp_url"
parameter="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker" />
</menu_item_call>
<menu_item_separator
@@ -3547,6 +3555,7 @@
name="Bug Reporing 101">
<menu_item_call.on_click
function="PromptShowURL"
+ name="BugReporting101_url"
parameter="WebLaunchBugReport101,http://wiki.secondlife.com/wiki/Bug_Reporting_101" />
</menu_item_call>
<menu_item_call
@@ -3555,6 +3564,7 @@
name="Security Issues">
<menu_item_call.on_click
function="PromptShowURL"
+ name="SecurityIssues_url"
parameter="WebLaunchSecurityIssues,http://wiki.secondlife.com/wiki/Security_issues" />
</menu_item_call>
<menu_item_call
@@ -3563,6 +3573,7 @@
name="QA Wiki">
<menu_item_call.on_click
function="PromptShowURL"
+ name="QAWiki_url"
parameter="WebLaunchQAWiki,http://wiki.secondlife.com/wiki/QA_Portal" />
</menu_item_call>
</menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml
index 959cc5764c..98f08452ff 100644
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -120,10 +120,10 @@
<menu_item_call label="Reprendre le contrôle" name="Release Keys"/>
<menu_item_separator label="-----------" name="separator4"/>
<menu_item_call label="Historique de mon compte..." name="Account History...">
- <on_click name="AccountHistory_url" userdata="WebLaunchAccountHistory,http://secondlife.com/account/transactions.php?lang=fr"/>
+ <menu_item_call.on_click name="AccountHistory_url" userdata="WebLaunchAccountHistory,http://secondlife.com/account/transactions.php?lang=fr"/>
</menu_item_call>
<menu_item_call label="Gérer mon compte..." name="Manage My Account...">
- <on_click name="ManageMyAccount_url" userdata="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=fr"/>
+ <menu_item_call.on_click name="ManageMyAccount_url" userdata="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=fr"/>
</menu_item_call>
<menu_item_call label="Acheter des L$..." name="Buy and Sell L$..."/>
<menu_item_separator label="-----------" name="separator5"/>
@@ -169,7 +169,9 @@
<menu_item_separator label="-----------" name="separator4"/>
<menu_item_call label="Mise au point sur la sélection" name="Focus on Selection"/>
<menu_item_call label="Zoom sur la sélection" name="Zoom to Selection"/>
- <menu_item_call label="Acheter l'objet" name="Menu Object Take"/>
+ <menu_item_call label="Acheter l'objet" name="Menu Object Take">
+ <menu_item_call.on_enable parameter="Acheter,Prendre" name="EnableBuyOrTake"/>
+ </menu_item_call>
<menu_item_call label="Prendre une copie" name="Take Copy"/>
<menu_item_call label="Remplacer l'objet dans le contenu de l'objet" name="Save Object Back to Object Contents"/>
<menu_item_separator label="-----------" name="separator6"/>
@@ -189,7 +191,7 @@
<menu_item_call label="Blog officiel..." name="Official Linden Blog..."/>
<menu_item_separator label="-----------" name="separator2"/>
<menu_item_call label="Aide sur le LSL..." name="Scripting Portal...">
- <on_click name="ScriptingPortal_url" userdata="WebLaunchLSLWiki,http://wiki.secondlife.com/wiki/LSL_Portal/fr" />
+ <menu_item_call.on_click name="ScriptingPortal_url" userdata="WebLaunchLSLWiki,http://wiki.secondlife.com/wiki/LSL_Portal/fr" />
</menu_item_call>
<menu_item_separator label="-----------" name="separator3"/>
<menu_item_call label="Signaler une infraction..." name="Report Abuse..."/>
@@ -199,14 +201,14 @@
<menu label="Signaler des bugs" name="Bug Reporting">
<menu_item_call label="Ouvrir un JIRA..." name="Public Issue Tracker..."/>
<menu_item_call label="Comment utiliser JIRA ?" name="Publc Issue Tracker Help...">
- <on_click name="PublicIssueTrackerHelp_url" userdata="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker/fr" />
+ <menu_item_call.on_click name="PublicIssueTrackerHelp_url" userdata="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker/fr" />
</menu_item_call>
<menu_item_separator label="-----------" name="separator7"/>
<menu_item_call label="Comment signaler des bugs ?" name="Bug Reporing 101...">
- <on_click name="BugReporting101_url" userdata="WebLaunchBugReport101,http://wiki.secondlife.com/wiki/Bug_Reporting_101/fr"/>
+ <menu_item_call.on_click name="BugReporting101_url" userdata="WebLaunchBugReport101,http://wiki.secondlife.com/wiki/Bug_Reporting_101/fr"/>
</menu_item_call>
<menu_item_call label="Comment signaler un problème de sécurité ?" name="Security Issues...">
- <on_click name="SecurityIssues_url" userdata="WebLaunchSecurityIssues,http://wiki.secondlife.com/wiki/Security_issues/fr"/>
+ <menu_item_call.on_click name="SecurityIssues_url" userdata="WebLaunchSecurityIssues,http://wiki.secondlife.com/wiki/Security_issues/fr"/>
</menu_item_call>
<menu_item_call label="Wiki Assurance Qualité…" name="QA Wiki..."/>
<menu_item_separator label="-----------" name="separator9"/>
--
cgit v1.2.3