From: Jihoon Kim Date: Wed, 2 Nov 2016 00:09:49 +0000 (+0900) Subject: Display language name abbrevibation in wearable profile X-Git-Tag: accepted/tizen/ivi/20161102.235515~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F78%2F94878%2F2;p=platform%2Fcore%2Fuifw%2Fise-default.git Display language name abbrevibation in wearable profile Change-Id: Ia16de6d01c9d1b648dd4cfbc4990ad910d0941bd Signed-off-by: Jihoon Kim --- diff --git a/data/layout/wearable/ise_lang_table.xml b/data/layout/wearable/ise_lang_table.xml index 8d927a9..83591f5 100644 --- a/data/layout/wearable/ise_lang_table.xml +++ b/data/layout/wearable/ise_lang_table.xml @@ -9,94 +9,94 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + diff --git a/src/sdk/ise_lang_table.cpp b/src/sdk/ise_lang_table.cpp index 5311fe6..b6b746b 100644 --- a/src/sdk/ise_lang_table.cpp +++ b/src/sdk/ise_lang_table.cpp @@ -41,7 +41,7 @@ using namespace scl; typedef struct Keyboard_UUID { std::string name; std::string uuid; -}Keyboard_UUID; +} Keyboard_UUID; static std::vector vec_keyboard_uuid; @@ -56,6 +56,7 @@ class Ise_Lang { void parsing_lang_table(const xmlNodePtr); void parsing_keyboard_uuid_table(const xmlNodePtr); }; + Ise_Lang::~Ise_Lang() { for (int i = 0; i < m_size; ++i) { if (m_table[i].language) @@ -64,6 +65,9 @@ Ise_Lang::~Ise_Lang() { if (m_table[i].language_name) free(m_table[i].language_name); + if (m_table[i].language_name_abbr) + free(m_table[i].language_name_abbr); + if (m_table[i].locale_string) free(m_table[i].locale_string); @@ -83,6 +87,7 @@ Ise_Lang::~Ise_Lang() { free(m_table[i].country_code_URL); } } + static int get_prop_int( const xmlNodePtr cur_node, @@ -204,6 +209,7 @@ Ise_Lang::parsing_keyboard_uuid_table(const xmlNodePtr p_node) { cur_node = cur_node->next; } } + static inline std::string find_uuid(const std::vector& vec_rec, const std::string& name) { std::vector::const_iterator it; @@ -247,6 +253,8 @@ Ise_Lang::parsing_lang_table(const xmlNodePtr p_node) { m_table[m_size].language = (sclchar*)language; xmlChar* language_name = xmlGetProp(cur_node, (const xmlChar*)"language_name"); m_table[m_size].language_name = (sclchar*)language_name; + xmlChar* language_name_abbr = xmlGetProp(cur_node, (const xmlChar*)"language_name_abbr"); + m_table[m_size].language_name_abbr = (sclchar*)language_name_abbr; xmlChar* locale_string = xmlGetProp(cur_node, (const xmlChar*)"locale_string"); m_table[m_size].locale_string = (sclchar*)locale_string; xmlChar* inputmode_QTY = xmlGetProp(cur_node, (const xmlChar*)"inputmode_QTY"); diff --git a/src/sdk/ise_lang_table.h b/src/sdk/ise_lang_table.h index 491705a..8069327 100644 --- a/src/sdk/ise_lang_table.h +++ b/src/sdk/ise_lang_table.h @@ -23,6 +23,7 @@ typedef struct SDK_ISE_LANG_TABLE { SDK_ISE_LANG_TABLE() { language = NULL; language_name = NULL; + language_name_abbr = NULL; locale_string = NULL; inputmode_QTY = NULL; inputmode_QTY_name = NULL; @@ -40,6 +41,8 @@ typedef struct SDK_ISE_LANG_TABLE { char *language; /* The translated UTF8 string of this language in its own language. */ char *language_name; + /* language name abbreviation */ + char *language_name_abbr; /* A locale string such as 'en_US' to let the application know what language the keyboard currently selected */ char *locale_string; diff --git a/src/sdk/sdk.cpp b/src/sdk/sdk.cpp index fbeb861..4e37a35 100644 --- a/src/sdk/sdk.cpp +++ b/src/sdk/sdk.cpp @@ -419,8 +419,13 @@ sclboolean CSDKISE::on_language_selected(const sclchar *language, const sclchar g_ui->set_string_substitution(url_postfixes[inner_loop], postfix.c_str()); } +#ifdef _WEARABLE + /* Replace LANGUAGE_STRING with language name abbreviation */ + g_ui->set_string_substitution(LANGUAGE_STRING, get_lang_table()[loop].language_name_abbr); +#else /* Replace LANGUAGE_STRING with localized language name */ g_ui->set_string_substitution(LANGUAGE_STRING, get_lang_table()[loop].language_name); +#endif /* Change main_keyboard_name with localized language name */ if (get_lang_table()[loop].main_keyboard_name) { g_ui->set_string_substitution(PLACEHOLDER_MAIN_KEYBOARD_NAME, get_lang_table()[loop].main_keyboard_name);