From 74db157b9406594a549a70415668dd6cbe17d1d3 Mon Sep 17 00:00:00 2001
From: Ethan Yonker <dees_troy@teamw.in>
Date: Wed, 28 Oct 2015 12:44:49 -0500
Subject: Multiple Language Support

This is similar to https://gerrit.omnirom.org/#/c/14014

A lot of the features built in the older patch set have been split
out into separate patches, most of which have already been merged.
The remaining functionality here should all be directly related to
language selection and loading. We always load English as a base
before loading other languages over the top of the base. The idea
is that if another language is missing a translation, then we will
still display the English.

Maybe still to do: read the /cache/recovery/last_locale file and
load a language based on that. For me, this file contains just:
en_US
We probably won't bother with region specific translations so we
would have to look at either trimming off the _US or using some
other method like perhaps a symlink or a combination of the two.

Thanks to _that for twmsg.cpp class

Change-Id: I9647a22e47883a3ddd2de1da51f64aab7c328f74
---
 gui/theme/portrait_hdpi/ui.xml | 53 +++++++++++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 21 deletions(-)

(limited to 'gui/theme/portrait_hdpi')

diff --git a/gui/theme/portrait_hdpi/ui.xml b/gui/theme/portrait_hdpi/ui.xml
index f8e1181f5..7708f926b 100644
--- a/gui/theme/portrait_hdpi/ui.xml
+++ b/gui/theme/portrait_hdpi/ui.xml
@@ -82,10 +82,15 @@
 		<variable name="tab_indicator_height" value="6" />
 		<variable name="tab3_width" value="360" />
 		<variable name="tab4_width" value="270" />
+		<variable name="tab5_width" value="216" />
 		<variable name="tab3_col2_x" value="360" />
 		<variable name="tab3_col3_x" value="720" />
 		<variable name="tab4_col2_x" value="270" />
 		<variable name="tab4_col4_x" value="810" />
+		<variable name="tab5_col2_x" value="216" />
+		<variable name="tab5_col3_x" value="432" />
+		<variable name="tab5_col4_x" value="648" />
+		<variable name="tab5_col5_x" value="864" />
 		<variable name="btn3_col2_x" value="384" />
 		<variable name="btn3_col3_x" value="732" />
 		<variable name="btn4_col2_x" value="297" />
@@ -247,7 +252,7 @@
 				<condition var1="tw_no_cpu_temp" var2="0" />
 				<font resource="font_m" />
 				<placement x="%indent%" y="%row1_header_y%" />
-				<text>CPU: %tw_cpu_temp% &#xB0;C</text>
+				<text>{@cpu_temp=CPU: %tw_cpu_temp% &#xB0;C}</text>
 			</object>
 
 			<object type="text" color="%text_color%">
@@ -264,7 +269,7 @@
 				</conditions>
 				<font resource="font_m" />
 				<placement x="%indent_right%" y="%row1_header_y%" placement="1" />
-				<text>Battery: %tw_battery%</text>
+				<text>{@battery_pct=Battery: %tw_battery%}</text>
 			</object>
 
 			<object type="fill" color="#000000">
@@ -357,7 +362,7 @@
 				<condition var1="tw_gui_sort_order" op="=" var2="1" />
 				<placement x="%indent%" y="%row1a_y%" />
 				<font resource="font_s" color="%text_button_color%" />
-				<text>Name</text>
+				<text>{@sort_by_name_only=Name}</text>
 				<image resource="sort_asc" />
 				<action function="set">tw_gui_sort_order=-1</action>
 			</object>
@@ -367,7 +372,7 @@
 				<condition var1="tw_gui_sort_order" op="=" var2="-1" />
 				<placement x="%indent%" y="%row1a_y%" />
 				<font resource="font_s" color="%text_button_color%" />
-				<text>Name</text>
+				<text>{@sort_by_name_only=Name}</text>
 				<image resource="sort_desc" />
 				<action function="set">tw_gui_sort_order=1</action>
 			</object>
@@ -380,7 +385,7 @@
 				</conditions>
 				<placement x="%indent%" y="%row1a_y%" />
 				<font resource="font_s" color="%text_button_color%" />
-				<text>Name</text>
+				<text>{@sort_by_name_only=Name}</text>
 				<image resource="sort_empty" />
 				<action function="set">tw_gui_sort_order=1</action>
 			</object>
@@ -390,7 +395,7 @@
 				<condition var1="tw_gui_sort_order" op="=" var2="2" />
 				<placement x="%btn3_col2_x%" y="%row1a_y%" />
 				<font resource="font_s" color="%text_button_color%" />
-				<text>Date</text>
+				<text>{@sort_by_date_only=Date}</text>
 				<image resource="sort_asc" />
 				<action function="set">tw_gui_sort_order=-2</action>
 			</object>
@@ -400,7 +405,7 @@
 				<condition var1="tw_gui_sort_order" op="=" var2="-2" />
 				<placement x="%btn3_col2_x%" y="%row1a_y%" />
 				<font resource="font_s" color="%text_button_color%" />
-				<text>Date</text>
+				<text>{@sort_by_date_only=Date}</text>
 				<image resource="sort_desc" />
 				<action function="set">tw_gui_sort_order=2</action>
 			</object>
@@ -413,7 +418,7 @@
 				</conditions>
 				<placement x="%btn3_col2_x%" y="%row1a_y%" />
 				<font resource="font_s" color="%text_button_color%" />
-				<text>Date</text>
+				<text>{@sort_by_date_only=Date}</text>
 				<image resource="sort_empty" />
 				<action function="set">tw_gui_sort_order=2</action>
 			</object>
@@ -423,7 +428,7 @@
 				<condition var1="tw_gui_sort_order" op="=" var2="3" />
 				<placement x="%btn3_col3_x%" y="%row1a_y%" />
 				<font resource="font_s" color="%text_button_color%" />
-				<text>Size</text>
+				<text>{@sort_by_size_only=Size}</text>
 				<image resource="sort_asc" />
 				<action function="set">tw_gui_sort_order=-3</action>
 			</object>
@@ -433,7 +438,7 @@
 				<condition var1="tw_gui_sort_order" op="=" var2="-3" />
 				<placement x="%btn3_col3_x%" y="%row1a_y%" />
 				<font resource="font_s" color="%text_button_color%" />
-				<text>Size</text>
+				<text>{@sort_by_size_only=Size}</text>
 				<image resource="sort_desc" />
 				<action function="set">tw_gui_sort_order=3</action>
 			</object>
@@ -446,7 +451,7 @@
 				</conditions>
 				<placement x="%btn3_col3_x%" y="%row1a_y%" />
 				<font resource="font_s" color="%text_button_color%" />
-				<text>Size</text>
+				<text>{@sort_by_size_only=Size}</text>
 				<image resource="sort_empty" />
 				<action function="set">tw_gui_sort_order=3</action>
 			</object>
@@ -455,41 +460,47 @@
 		<template name="tabs_backup">
 			<object type="button" style="tab">
 				<placement x="0" y="%row1_y%" w="%tab3_width%" h="%tab_height%" />
-				<text>BACKUP</text>
+				<text>{@tab_backup=BACKUP}</text>
 				<action function="page">backup</action>
 			</object>
 
 			<object type="button" style="tab">
 				<placement x="%tab3_col2_x%" y="%row1_y%" w="%tab3_width%" h="%tab_height%" />
-				<text>OPTIONS</text>
+				<text>{@tab_options=OPTIONS}</text>
 				<action function="page">backup_options</action>
 			</object>
 		</template>
 
 		<template name="tabs_settings">
 			<object type="button" style="tab">
-				<placement x="0" y="%row1_y%" w="%tab4_width%" h="%tab_height%" />
-				<text>GENERAL</text>
+				<placement x="0" y="%row1_y%" w="%tab5_width%" h="%tab_height%" />
+				<text>{@tab_general=GENERAL}</text>
 				<action function="page">settings</action>
 			</object>
 
 			<object type="button" style="tab">
-				<placement x="%tab4_col2_x%" y="%row1_y%" w="%tab4_width%" h="%tab_height%" />
-				<text>TIME ZONE</text>
+				<placement x="%tab5_col2_x%" y="%row1_y%" w="%tab5_width%" h="%tab_height%" />
+				<text>{@tab_time_zone=TIME ZONE}</text>
 				<action function="page">settings_timezone</action>
 			</object>
 
 			<object type="button" style="tab">
-				<placement x="%center_x%" y="%row1_y%" w="%tab4_width%" h="%tab_height%" />
-				<text>SCREEN</text>
+				<placement x="%tab5_col3_x%" y="%row1_y%" w="%tab5_width%" h="%tab_height%" />
+				<text>{@tab_screen=SCREEN}</text>
 				<action function="page">settings_screen</action>
 			</object>
 
 			<object type="button" style="tab">
-				<placement x="%tab4_col4_x%" y="%row1_y%" w="%tab4_width%" h="%tab_height%" />
-				<text>VIBRATION</text>
+				<placement x="%tab5_col4_x%" y="%row1_y%" w="%tab5_width%" h="%tab_height%" />
+				<text>{@tab_vibration=VIBRATION}</text>
 				<action function="page">settings_vibration</action>
 			</object>
+
+			<object type="button" style="tab">
+				<placement x="%tab5_col5_x%" y="%row1_y%" w="%tab5_width%" h="%tab_height%" />
+				<text>{@tab_language=LANGUAGE}</text>
+				<action function="page">settings_language</action>
+			</object>
 		</template>
 
 		<template name="console">
-- 
cgit v1.2.3