From f05618b3b91b47dfc7fa11a02dd615692f69d922 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Fri, 5 Dec 2014 19:17:52 -0500
Subject: [PATCH] Add possibility to specify non-translated texts in GUI XML
 files, and use it for debug strings that should not be translated

---
 data/gui/debug_slider.stkgui    | 12 ++++++------
 data/gui/main.stkgui            | 12 ++++++------
 src/guiengine/engine.cpp        |  2 +-
 src/guiengine/screen_loader.cpp |  7 +++++++
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/data/gui/debug_slider.stkgui b/data/gui/debug_slider.stkgui
index 270f892b7..a0285405c 100644
--- a/data/gui/debug_slider.stkgui
+++ b/data/gui/debug_slider.stkgui
@@ -2,37 +2,37 @@
 <stkgui>
     <div x="2%" y="10%" width="96%" height="80%" layout="vertical-row" >
         <div proportion="1" width="100%" layout="horizontal-row">
-            <label id="Red" text="Red"/>
+            <label id="Red" raw_text="Red"/>
             <spacer width="25"/>
             <gauge id="red_slider" min_value="0" max_value="100" proportion="1"/>
         </div>
         
         <div proportion="1" width="100%" layout="horizontal-row">
-            <label id="Green" text="Green"/>
+            <label id="Green" raw_text="Green"/>
             <spacer width="25"/>
             <gauge id="green_slider" min_value="0" max_value="100" proportion="1"/>
         </div>
         
         <div proportion="1" width="100%" layout="horizontal-row">
-            <label id="Blue" text="Blue"/>
+            <label id="Blue" raw_text="Blue"/>
             <spacer width="25"/>
             <gauge id="blue_slider" min_value="0" max_value="100" proportion="1"/>
         </div>
         
         <div proportion="1" width="100%" layout="horizontal-row">
-            <label id="SSAO radius" text="SSAO Radius"/>
+            <label id="SSAO radius" raw_text="SSAO Radius"/>
             <spacer width="50"/>
             <gauge id="ssao_radius" min_value="0" max_value="100" proportion="1" />
         </div>
         
         <div proportion="1" width="100%" layout="horizontal-row">
-            <label id="SSAO k" text="SSAO K"/>
+            <label id="SSAO k" raw_text="SSAO K"/>
             <spacer width="25"/>
             <gauge id="ssao_k" min_value="0" max_value="100" proportion="1"/>
         </div>
         
         <div proportion="1" width="100%" layout="horizontal-row">
-            <label id="SSAO Sigma" text="SSAO sigma"/>
+            <label id="SSAO Sigma" raw_text="SSAO sigma"/>
             <spacer width="50"/>
             <gauge id="ssao_sigma" min_value="0" max_value="100" proportion="1"/>
         </div>
diff --git a/data/gui/main.stkgui b/data/gui/main.stkgui
index 788b48e71..11769b286 100644
--- a/data/gui/main.stkgui
+++ b/data/gui/main.stkgui
@@ -40,17 +40,17 @@
 
             <buttonbar id="menu_bottomrow" x="0" y="0" width="38%" height="100%" align="center">
                 <icon-button id="test_gpwin" width="64" height="64" icon="gui/main_options.png" extend_label="50"
-                             text="TEST: GPWin" label_location="hover"/>
+                             raw_text="TEST: GPWin" label_location="hover"/>
                 <icon-button id="test_gplose" width="64" height="64" icon="gui/main_options.png" extend_label="50"
-                             text="TEST: GPLose" label_location="hover"/>
+                             raw_text="TEST: GPLose" label_location="hover"/>
                 <icon-button id="test_unlocked" width="64" height="64" icon="gui/main_options.png" extend_label="50"
-                             text="TEST: Unlocked" label_location="hover"/>
+                             raw_text="TEST: Unlocked" label_location="hover"/>
                 <icon-button id="test_unlocked2" width="64" height="64" icon="gui/main_options.png" extend_label="50"
-                             text="TEST: Unlocked 2" label_location="hover"/>
+                             raw_text="TEST: Unlocked 2" label_location="hover"/>
                 <icon-button id="test_intro" width="64" height="64" icon="gui/main_options.png" extend_label="50"
-                             text="TEST: Intro" label_location="hover"/>
+                             raw_text="TEST: Intro" label_location="hover"/>
                 <icon-button id="test_outro" width="64" height="64" icon="gui/main_options.png" extend_label="50"
-                             text="TEST: Outro" label_location="hover"/>     
+                             raw_text="TEST: Outro" label_location="hover"/>     
                 <icon-button id="options" width="64" height="64" icon="gui/main_options.png" extend_label="50"
                              I18N="In the main screen"  text="Options" label_location="hover"/>
                 <icon-button id="help" width="64" height="64" icon="gui/main_help.png"  extend_label="50"
diff --git a/src/guiengine/engine.cpp b/src/guiengine/engine.cpp
index 8a5ab0998..2a367198c 100644
--- a/src/guiengine/engine.cpp
+++ b/src/guiengine/engine.cpp
@@ -288,7 +288,7 @@ namespace GUIEngine
 
  \n
  \subsection prop2 PROP_TEXT
- <em> Name in XML files: </em> \c "text"
+ <em> Name in XML files: </em> \c "text" or "raw_text" ("text" is translated, "raw_text" is not)
 
  gives text (a label) to the widget where supported. Ribbon-grids give a
  special meaning to this parameter, see ribbon-grid docs above.
diff --git a/src/guiengine/screen_loader.cpp b/src/guiengine/screen_loader.cpp
index 1c1c5a23e..4126806cc 100644
--- a/src/guiengine/screen_loader.cpp
+++ b/src/guiengine/screen_loader.cpp
@@ -232,6 +232,13 @@ if(prop_name != NULL) widget.m_properties[prop_flag] = core::stringc(prop_name).
                     widget.m_is_text_rtl = (translations->isRTLLanguage() && widget.m_text != text);
                 }
 
+                const wchar_t* raw_text = xml->getAttributeValue(L"raw_text");
+
+                if (raw_text != NULL)
+                {
+                    widget.m_text = raw_text;
+                }
+
                 if (parent != NULL)
                 {
                     widget.setParent(parent);