GNOME.org
 

[gcalctool] Changed mind about translating short currency names, instead use the full name in the conversion com

commit 08ecbcdfe5f0a01350c5825dadc3414ee9c15d55
Author: Robert Ancell <robert ancell canonical com>
Date:   Tue Feb 1 09:04:19 2011 +1100

    Changed mind about translating short currency names, instead use the full name in the conversion combo box

 src/currency-manager.c |  121 ++++++++++++++++++++++++------------------------
 src/currency.c         |   10 ----
 src/currency.h         |    1 -
 src/unit-manager.c     |    2 +-
 4 files changed, 61 insertions(+), 73 deletions(-)
---
diff --git a/src/currency-manager.c b/src/currency-manager.c
index c86e294..ecbefc1 100644
--- a/src/currency-manager.c
+++ b/src/currency-manager.c
@@ -17,65 +17,65 @@ typedef struct {
     char *long_name;
 } CurrencyInfo;
 static const CurrencyInfo currency_info[] = {
-    {NC_("currency-symbol", "AED"), "إ.د",  N_("United Arab Emirates dirham")},
-    {NC_("currency-symbol", "AUD"), "$",    N_("Australian dollar")},
-    {NC_("currency-symbol", "BGN"), "лв",   N_("Bulgarian lev")},
-    {NC_("currency-symbol", "BHD"), ".ب.د", N_("Bahraini dinar")},
-    {NC_("currency-symbol", "BND"), "$",    N_("Brunei dollar")},
-    {NC_("currency-symbol", "BRL"), "R$",   N_("Brazilian real")},
-    {NC_("currency-symbol", "BWP"), "P",    N_("Botswana pula")},
-    {NC_("currency-symbol", "CAD"), "$",    N_("Canadian dollar")},
-    {NC_("currency-symbol", "CHF"), "Fr",   N_("Swiss franc")},
-    {NC_("currency-symbol", "CLP"), "$",    N_("Chilean peso")},
-    {NC_("currency-symbol", "CNY"), "å??",   N_("Chinese yuan renminbi")},
-    {NC_("currency-symbol", "COP"), "$",    N_("Colombian peso")},
-    {NC_("currency-symbol", "CZK"), "KÄ?",   N_("Czech koruna")},
-    {NC_("currency-symbol", "DKK"), "kr",   N_("Danish krone")},
-    {NC_("currency-symbol", "DZD"), "ج.د",  N_("Algerian dinar")},
-    {NC_("currency-symbol", "EEK"), "KR",   N_("Estonian kroon")},
-    {NC_("currency-symbol", "EUR"), "â?¬",    N_("Euro")},
-    {NC_("currency-symbol", "GBP"), "£",    N_("Pound sterling")},
-    {NC_("currency-symbol", "HKD"), "$",    N_("Hong Kong dollar")},
-    {NC_("currency-symbol", "HRK"), "kn",   N_("Croatian kuna")},
-    {NC_("currency-symbol", "HUF"), "Ft",   N_("Hungarian forint")},
-    {NC_("currency-symbol", "IDR"), "Rp",   N_("Indonesian rupiah")},
-    {NC_("currency-symbol", "ILS"), "â?ª",    N_("Israeli new shekel")},
-    {NC_("currency-symbol", "INR"), "â?¹",    N_("Indian rupee")},
-    {NC_("currency-symbol", "IRR"), "ï·¼",    N_("Iranian rial")},
-    {NC_("currency-symbol", "ISK"), "kr",   N_("Icelandic krona")},
-    {NC_("currency-symbol", "JPY"), "Â¥",    N_("Japanese yen")},
-    {NC_("currency-symbol", "KRW"), "â?©",    N_("South Korean won")},
-    {NC_("currency-symbol", "KWD"), "Ù?.د",  N_("Kuwaiti dinar")},
-    {NC_("currency-symbol", "KZT"), "â?¸",    N_("Kazakhstani tenge")},
-    {NC_("currency-symbol", "LKR"), "Rs",   N_("Sri Lankan rupee")},
-    {NC_("currency-symbol", "LTL"), "Lt",   N_("Lithuanian litas")},
-    {NC_("currency-symbol", "LVL"), "Ls",   N_("Latvian lats")},
-    {NC_("currency-symbol", "LYD"), "د.Ù?",  N_("Libyan dinar")},
-    {NC_("currency-symbol", "MUR"), "Rs",   N_("Mauritian rupee")},
-    {NC_("currency-symbol", "MXN"), "$",    N_("Mexican peso")},
-    {NC_("currency-symbol", "MYR"), "RM",   N_("Malaysian ringgit")},
-    {NC_("currency-symbol", "NOK"), "kr",   N_("Norwegian krone")},
-    {NC_("currency-symbol", "NPR"), "Rs",   N_("Nepalese rupee")},
-    {NC_("currency-symbol", "NZD"), "$",    N_("New Zealand dollar")},
-    {NC_("currency-symbol", "OMR"), "ع.ر.", N_("Omani rial")},
-    {NC_("currency-symbol", "PEN"), "S/.",  N_("Peruvian nuevo sol")},
-    {NC_("currency-symbol", "PHP"), "â?±",    N_("Philippine peso")},
-    {NC_("currency-symbol", "PKR"), "Rs",   N_("Pakistani rupee")},
-    {NC_("currency-symbol", "PLN"), "zÅ?",   N_("Polish zloty")},
-    {NC_("currency-symbol", "QAR"), "Ù?.ر",  N_("Qatari riyal")},
-    {NC_("currency-symbol", "RON"), "L",    N_("New Romanian leu")},
-    {NC_("currency-symbol", "RUB"), "Ñ?Ñ?б.", N_("Russian rouble")},
-    {NC_("currency-symbol", "SAR"), "س.ر",  N_("Saudi riyal")},
-    {NC_("currency-symbol", "SEK"), "kr",   N_("Swedish krona")},
-    {NC_("currency-symbol", "SGD"), "$",    N_("Singapore dollar")},
-    {NC_("currency-symbol", "THB"), "฿",    N_("Thai baht")},
-    {NC_("currency-symbol", "TND"), "ت.د",  N_("Tunisian dinar")},
-    {NC_("currency-symbol", "TRY"), "TL",   N_("New Turkish lira")},
-    {NC_("currency-symbol", "TTD"), "$",    N_("Trinidad and Tobago dollar")},
-    {NC_("currency-symbol", "USD"), "$",    N_("US dollar")},
-    {NC_("currency-symbol", "UYU"), "$",    N_("Uruguayan peso")},
-    {NC_("currency-symbol", "VEF"), "Bs F", N_("Venezuelan bolívar")},
-    {NC_("currency-symbol", "ZAR"), "R",    N_("South African rand")},
+    {"AED", "إ.د",  N_("United Arab Emirates dirham")},
+    {"AUD", "$",    N_("Australian dollar")},
+    {"BGN", "лв",   N_("Bulgarian lev")},
+    {"BHD", ".ب.د", N_("Bahraini dinar")},
+    {"BND", "$",    N_("Brunei dollar")},
+    {"BRL", "R$",   N_("Brazilian real")},
+    {"BWP", "P",    N_("Botswana pula")},
+    {"CAD", "$",    N_("Canadian dollar")},
+    {"CHF", "Fr",   N_("Swiss franc")},
+    {"CLP", "$",    N_("Chilean peso")},
+    {"CNY", "å??",   N_("Chinese yuan renminbi")},
+    {"COP", "$",    N_("Colombian peso")},
+    {"CZK", "KÄ?",   N_("Czech koruna")},
+    {"DKK", "kr",   N_("Danish krone")},
+    {"DZD", "ج.د",  N_("Algerian dinar")},
+    {"EEK", "KR",   N_("Estonian kroon")},
+    {"EUR", "â?¬",    N_("Euro")},
+    {"GBP", "£",    N_("Pound sterling")},
+    {"HKD", "$",    N_("Hong Kong dollar")},
+    {"HRK", "kn",   N_("Croatian kuna")},
+    {"HUF", "Ft",   N_("Hungarian forint")},
+    {"IDR", "Rp",   N_("Indonesian rupiah")},
+    {"ILS", "â?ª",    N_("Israeli new shekel")},
+    {"INR", "â?¹",    N_("Indian rupee")},
+    {"IRR", "ï·¼",    N_("Iranian rial")},
+    {"ISK", "kr",   N_("Icelandic krona")},
+    {"JPY", "Â¥",    N_("Japanese yen")},
+    {"KRW", "â?©",    N_("South Korean won")},
+    {"KWD", "Ù?.د",  N_("Kuwaiti dinar")},
+    {"KZT", "â?¸",    N_("Kazakhstani tenge")},
+    {"LKR", "Rs",   N_("Sri Lankan rupee")},
+    {"LTL", "Lt",   N_("Lithuanian litas")},
+    {"LVL", "Ls",   N_("Latvian lats")},
+    {"LYD", "د.Ù?",  N_("Libyan dinar")},
+    {"MUR", "Rs",   N_("Mauritian rupee")},
+    {"MXN", "$",    N_("Mexican peso")},
+    {"MYR", "RM",   N_("Malaysian ringgit")},
+    {"NOK", "kr",   N_("Norwegian krone")},
+    {"NPR", "Rs",   N_("Nepalese rupee")},
+    {"NZD", "$",    N_("New Zealand dollar")},
+    {"OMR", "ع.ر.", N_("Omani rial")},
+    {"PEN", "S/.",  N_("Peruvian nuevo sol")},
+    {"PHP", "â?±",    N_("Philippine peso")},
+    {"PKR", "Rs",   N_("Pakistani rupee")},
+    {"PLN", "zÅ?",   N_("Polish zloty")},
+    {"QAR", "Ù?.ر",  N_("Qatari riyal")},
+    {"RON", "L",    N_("New Romanian leu")},
+    {"RUB", "Ñ?Ñ?б.", N_("Russian rouble")},
+    {"SAR", "س.ر",  N_("Saudi riyal")},
+    {"SEK", "kr",   N_("Swedish krona")},
+    {"SGD", "$",    N_("Singapore dollar")},
+    {"THB", "฿",    N_("Thai baht")},
+    {"TND", "ت.د",  N_("Tunisian dinar")},
+    {"TRY", "TL",   N_("New Turkish lira")},
+    {"TTD", "$",    N_("Trinidad and Tobago dollar")},
+    {"USD", "$",    N_("US dollar")},
+    {"UYU", "$",    N_("Uruguayan peso")},
+    {"VEF", "Bs F", N_("Venezuelan bolívar")},
+    {"ZAR", "R",    N_("South African rand")},
     {NULL, NULL}
 };
 
@@ -105,7 +105,6 @@ currency_manager_get_default(void)
 
     for (i = 0; currency_info[i].short_name; i++) {
         Currency *c = currency_new(currency_info[i].short_name,
-                                   g_dpgettext2(NULL, "currency-symbol", currency_info[i].short_name),
                                    currency_info[i].long_name,
                                    currency_info[i].symbol);
         default_currency_manager->priv->currencies = g_list_append(default_currency_manager->priv->currencies, c);
@@ -178,7 +177,7 @@ add_currency(CurrencyManager *manager, const gchar *short_name)
     }
 
     g_warning("Currency %s is not in the currency table", short_name);
-    c = currency_new(short_name, short_name, short_name, short_name);
+    c = currency_new(short_name, short_name, short_name);
     manager->priv->currencies = g_list_append(manager->priv->currencies, c);
 
     return c;
diff --git a/src/currency.c b/src/currency.c
index ce068d2..cb6f85a 100644
--- a/src/currency.c
+++ b/src/currency.c
@@ -8,7 +8,6 @@
 struct CurrencyPrivate
 {
     gchar *name;
-    gchar *short_display_name;
     gchar *display_name;
     gchar *symbol;
     MPNumber value;
@@ -19,14 +18,12 @@ G_DEFINE_TYPE (Currency, currency, G_TYPE_OBJECT);
 
 Currency *
 currency_new(const gchar *name,
-             const gchar *short_display_name,
              const gchar *display_name,
              const gchar *symbol)
 {
     Currency *currency = g_object_new(currency_get_type(), NULL);
 
     currency->priv->name = g_strdup(name);
-    currency->priv->short_display_name = g_strdup(short_display_name);  
     currency->priv->display_name = g_strdup(display_name);
     currency->priv->symbol = g_strdup(symbol);
 
@@ -42,13 +39,6 @@ currency_get_name(Currency *currency)
 
 
 const gchar *
-currency_get_short_display_name(Currency *currency)
-{
-    return currency->priv->short_display_name;
-}
-
-
-const gchar *
 currency_get_display_name(Currency *currency)
 {
     return currency->priv->display_name;
diff --git a/src/currency.h b/src/currency.h
index fdf0d20..f5393ae 100644
--- a/src/currency.h
+++ b/src/currency.h
@@ -24,7 +24,6 @@ typedef struct
 GType currency_get_type(void);
 
 Currency *currency_new(const gchar *name,
-                       const gchar *short_display_name,
                        const gchar *display_name,
                        const gchar *symbol);
 
diff --git a/src/unit-manager.c b/src/unit-manager.c
index 63baf30..3e96fb9 100644
--- a/src/unit-manager.c
+++ b/src/unit-manager.c
@@ -114,7 +114,7 @@ unit_manager_get_default(void)
         Unit *unit;
 
         format = g_strdup_printf("%s%%s", currency_get_symbol(currency));
-        unit = unit_new(currency_get_name(currency), currency_get_short_display_name(currency), format, NULL, NULL, currency_get_name(currency));
+        unit = unit_new(currency_get_name(currency), currency_get_display_name(currency), format, NULL, NULL, currency_get_name(currency));
         g_free(format);
 
         unit_category_add_unit(category, unit);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]