[E-devel] [patch] clock module -- diplomacy (take 2)

Fri, 16 Dec 2005 04:15:04 -0800

Seems I got little response to my last patch, fixing the language of the clock module.. so I did a better one.. 

- rename functions and enums
- add translation for all languages (that had a 24 Hour translation)
Hope this can go in, seeing "12 hour" referred to as normal can be annoying to those who never use it.. 

Cheers,
--
Morten
:wq

Index: po/bg.po
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/po/bg.po,v
retrieving revision 1.5
diff -u -r1.5 bg.po
--- po/bg.po    28 Jul 2005 07:43:57 -0000      1.5
+++ po/bg.po    16 Dec 2005 12:04:35 -0000
@@ -200,7 +200,7 @@
 msgid "Always On Top"
 msgstr "Винаги отгоре"
 
-#: src/bin/e_border.c:5686 src/modules/clock/e_mod_main.c:341
+#: src/bin/e_border.c:5686
 msgid "Normal"
 msgstr "Нормално"
 
@@ -857,6 +857,10 @@
 msgid "No Digital Display"
 msgstr "Няма цифрово лице"
 
+#: src/modules/clock/e_mod_main.c:349
+msgid "12 Hour"
+msgstr "12 часа"
+
 #: src/modules/clock/e_mod_main.c:352
 msgid "24 Hour"
 msgstr "24 часа"
Index: po/da.po
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/po/da.po,v
retrieving revision 1.5
diff -u -r1.5 da.po
--- po/da.po    1 Dec 2005 06:46:40 -0000       1.5
+++ po/da.po    16 Dec 2005 12:04:35 -0000
@@ -1053,7 +1053,7 @@
 msgid "Always On Top"
 msgstr "Altid øverst"
 
-#: src/bin/e_int_border_menu.c:51 src/modules/clock/e_mod_main.c:349
+#: src/bin/e_int_border_menu.c:51
 #: src/modules/pager/e_mod_main.c:458
 msgid "Normal"
 msgstr "Normal"
@@ -1593,6 +1593,10 @@
 msgid "No Digital Display"
 msgstr "Intet digitalur"
 
+#: src/modules/clock/e_mod_main.c:349
+msgid "12 Hour"
+msgstr "12 timer"
+
 #: src/modules/clock/e_mod_main.c:360
 msgid "24 Hour"
 msgstr "24 timer"
Index: po/de.po
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/po/de.po,v
retrieving revision 1.29
diff -u -r1.29 de.po
--- po/de.po    17 Oct 2005 07:10:59 -0000      1.29
+++ po/de.po    16 Dec 2005 12:04:35 -0000
@@ -190,6 +190,10 @@
 msgid "No Digital Display"
 msgstr "Keine Digitale Uhr"
 
+#: src/modules/clock/e_mod_main.c:349
+msgid "12 Hour"
+msgstr "12 Stunden"
+
 #: src/modules/clock/e_mod_main.c:352
 msgid "24 Hour"
 msgstr "24 Stunden"
Index: po/es.po
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/po/es.po,v
retrieving revision 1.13
diff -u -r1.13 es.po
--- po/es.po    3 Dec 2005 02:34:23 -0000       1.13
+++ po/es.po    16 Dec 2005 12:04:36 -0000
@@ -1137,7 +1137,6 @@
 msgstr "Siempre arriba"
 
 #: src/bin/e_int_border_menu.c:51
-#: src/modules/clock/e_mod_main.c:349
 #: src/modules/pager/e_mod_main.c:458
 msgid "Normal"
 msgstr "Normal"
@@ -1535,6 +1534,10 @@
 msgid "No Digital Display"
 msgstr "Sin visor digital"
 
+#: src/modules/clock/e_mod_main.c:349
+msgid "12 Hour"
+msgstr "12 horas"
+
 #: src/modules/clock/e_mod_main.c:360
 msgid "24 Hour"
 msgstr "24 horas"
Index: po/fr.po
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/po/fr.po,v
retrieving revision 1.10
diff -u -r1.10 fr.po
--- po/fr.po    1 Dec 2005 07:13:38 -0000       1.10
+++ po/fr.po    16 Dec 2005 12:04:36 -0000
@@ -1447,6 +1447,10 @@
 msgid "No Digital Display"
 msgstr "Aucun Affichage Numérique"
 
+#: src/modules/clock/e_mod_main.c:349
+msgid "12 Hour"
+msgstr "12 Heures"
+
 #: src/modules/clock/e_mod_main.c:360
 msgid "24 Hour"
 msgstr "24 Heures"
Index: po/it.po
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/po/it.po,v
retrieving revision 1.23
diff -u -r1.23 it.po
--- po/it.po    4 Dec 2005 14:22:23 -0000       1.23
+++ po/it.po    16 Dec 2005 12:04:36 -0000
@@ -1203,7 +1203,7 @@
 msgid "Always On Top"
 msgstr "Sempre sulle altre"
 
-#: src/bin/e_int_border_menu.c:53 src/modules/clock/e_mod_main.c:349
+#: src/bin/e_int_border_menu.c:53
 #: src/modules/pager/e_mod_main.c:458
 msgid "Normal"
 msgstr "Normale"
@@ -1820,6 +1820,10 @@
 msgid "No Digital Display"
 msgstr "Nessun display"
 
+#: src/modules/clock/e_mod_main.c:349
+msgid "12 Hour"
+msgstr "12 ore"
+
 #: src/modules/clock/e_mod_main.c:360
 msgid "24 Hour"
 msgstr "24 ore"
Index: po/ja.po
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/po/ja.po,v
retrieving revision 1.11
diff -u -r1.11 ja.po
--- po/ja.po    10 Dec 2005 04:40:42 -0000      1.11
+++ po/ja.po    16 Dec 2005 12:04:37 -0000
@@ -632,7 +632,7 @@
 msgid "Always On Top"
 msgstr "常に一番手前に"
 
-#: src/bin/e_int_border_menu.c:53 src/modules/clock/e_mod_main.c:349
+#: src/bin/e_int_border_menu.c:53
 #: src/modules/pager/e_mod_main.c:458
 msgid "Normal"
 msgstr "普通"
@@ -1705,6 +1705,10 @@
 msgid "No Digital Display"
 msgstr "デジタル表示無し"
 
+#: src/modules/clock/e_mod_main.c:349
+msgid "12 Hour"
+msgstr "12 時間表示"
+
 #: src/modules/clock/e_mod_main.c:360
 msgid "24 Hour"
 msgstr "24 時間表示"
Index: po/nb.po
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/po/nb.po,v
retrieving revision 1.1
diff -u -r1.1 nb.po
--- po/nb.po    15 Oct 2005 05:50:16 -0000      1.1
+++ po/nb.po    16 Dec 2005 12:04:37 -0000
@@ -193,7 +193,7 @@
 msgid "Always On Top"
 msgstr "Alltid på toppen"
 
-#: src/bin/e_border.c:6285 src/modules/clock/e_mod_main.c:349
+#: src/bin/e_border.c:6285
 #: src/modules/pager/e_mod_main.c:458
 msgid "Normal"
 msgstr "Normal"
@@ -954,9 +954,13 @@
 msgid "No Digital Display"
 msgstr "Fjern digital klokke"
 
+#: src/modules/clock/e_mod_main.c:349
+msgid "12 Hour"
+msgstr "12-timers"
+
 #: src/modules/clock/e_mod_main.c:360
 msgid "24 Hour"
-msgstr "24 timer"
+msgstr "24-timers"
 
 #: src/modules/clock/e_mod_main.c:372
 msgid "Digital Display"
Index: po/nl.po
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/po/nl.po,v
retrieving revision 1.8
diff -u -r1.8 nl.po
--- po/nl.po    27 Nov 2005 11:50:15 -0000      1.8
+++ po/nl.po    16 Dec 2005 12:04:37 -0000
@@ -1024,7 +1024,7 @@
 msgid "Always On Top"
 msgstr "Altijd op Voorgrond"
 
-#: src/bin/e_int_border_menu.c:51 src/modules/clock/e_mod_main.c:349
+#: src/bin/e_int_border_menu.c:51
 #: src/modules/pager/e_mod_main.c:458
 msgid "Normal"
 msgstr "Normaal"
@@ -1566,6 +1566,10 @@
 msgid "No Digital Display"
 msgstr "Geen Digitale Klok"
 
+#: src/modules/clock/e_mod_main.c:349
+msgid "12 Hour"
+msgstr "12 uren"
+
 #: src/modules/clock/e_mod_main.c:360
 msgid "24 Hour"
 msgstr "24 uren"
Index: po/pl.po
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/po/pl.po,v
retrieving revision 1.8
diff -u -r1.8 pl.po
--- po/pl.po    21 Oct 2005 07:27:33 -0000      1.8
+++ po/pl.po    16 Dec 2005 12:04:37 -0000
@@ -412,7 +412,7 @@
 msgid "Always On Top"
 msgstr "Zawsze na wierzchu"
 
-#: src/bin/e_border.c:6311 src/modules/pager/e_mod_main.c:458
+#: src/bin/e_border.c:6311
 #: src/modules/clock/e_mod_main.c:349
 msgid "Normal"
 msgstr "Normalny"
@@ -1057,6 +1057,10 @@
 msgid "No Digital Display"
 msgstr "Bez Wyświetlacza Cyfrowego"
 
+#: src/modules/pager/e_mod_main.c:458
+msgid "12 Hour"
+msgstr "12 godzinny"
+
 #: src/modules/clock/e_mod_main.c:360
 msgid "24 Hour"
 msgstr "24 godzinny"
Index: po/ru.po
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/po/ru.po,v
retrieving revision 1.7
diff -u -r1.7 ru.po
--- po/ru.po    15 Oct 2005 08:58:03 -0000      1.7
+++ po/ru.po    16 Dec 2005 12:04:37 -0000
@@ -289,7 +289,7 @@
 msgid "Always On Top"
 msgstr "Всегда Поверху"
 
-#: src/bin/e_border.c:6303 src/modules/pager/e_mod_main.c:458
+#: src/bin/e_border.c:6303
 #: src/modules/clock/e_mod_main.c:349
 msgid "Normal"
 msgstr "Нормально"
@@ -1342,6 +1342,11 @@
 msgid "No Digital Display"
 msgstr "Нет Цифрового Показа"
 
+#: src/modules/pager/e_mod_main.c:458
+#, fuzzy
+msgid "12 Hour"
+msgstr "12 Час"
+
 #: src/modules/clock/e_mod_main.c:360
 #, fuzzy
 msgid "24 Hour"
Index: po/sk.po
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/po/sk.po,v
retrieving revision 1.2
diff -u -r1.2 sk.po
--- po/sk.po    6 Aug 2005 03:54:46 -0000       1.2
+++ po/sk.po    16 Dec 2005 12:04:37 -0000
@@ -705,7 +705,7 @@
 msgid "Always On Top"
 msgstr "Vždy Navrchu"
 
-#: src/bin/e_border.c:5784 src/modules/clock/e_mod_main.c:341
+#: src/bin/e_border.c:5784
 #: src/modules/desktopname/e_mod_main.c:149
 msgid "Normal"
 msgstr "Normálne"
@@ -1091,6 +1091,10 @@
 msgid "No Digital Display"
 msgstr "Žiaden Digitálny Displej"
 
+#: src/modules/clock/e_mod_main.c:341
+msgid "12 Hour"
+msgstr "12 Hodín"
+
 #: src/modules/clock/e_mod_main.c:352
 msgid "24 Hour"
 msgstr "24 Hodín"
Index: po/sl.po
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/po/sl.po,v
retrieving revision 1.8
diff -u -r1.8 sl.po
--- po/sl.po    23 Sep 2005 00:05:57 -0000      1.8
+++ po/sl.po    16 Dec 2005 12:04:37 -0000
@@ -754,7 +754,7 @@
 msgid "Always On Top"
 msgstr "Vedno na Vrhu"
 
-#: src/bin/e_border.c:6345 src/modules/clock/e_mod_main.c:341
+#: src/bin/e_border.c:6345
 #: src/modules/pager/e_mod_main.c:460
 msgid "Normal"
 msgstr "Normalno"
@@ -1158,6 +1158,11 @@
 msgid "No Digital Display"
 msgstr "Brez digitalnega prikaza"
 
+#: src/modules/clock/e_mod_main.c:341
+#, fuzzy
+msgid "12 Hour"
+msgstr "12 ur"
+
 #: src/modules/clock/e_mod_main.c:352
 #, fuzzy
 msgid "24 Hour"
Index: po/sv.po
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/po/sv.po,v
retrieving revision 1.12
diff -u -r1.12 sv.po
--- po/sv.po    13 Dec 2005 12:49:40 -0000      1.12
+++ po/sv.po    16 Dec 2005 12:04:38 -0000
@@ -603,7 +603,7 @@
 msgid "Always On Top"
 msgstr "Alltid överst"
 
-#: src/bin/e_int_border_menu.c:53 src/modules/clock/e_mod_main.c:349
+#: src/bin/e_int_border_menu.c:53
 #: src/modules/pager/e_mod_main.c:458
 msgid "Normal"
 msgstr "Normal"
@@ -1661,6 +1661,10 @@
 msgid "No Digital Display"
 msgstr "Ingen digital visning"
 
+#: src/modules/clock/e_mod_main.c:349
+msgid "12 Hour"
+msgstr "12 timmar"
+
 #: src/modules/clock/e_mod_main.c:360
 msgid "24 Hour"
 msgstr "24 timmar"
Index: po/zh_CN.po
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/po/zh_CN.po,v
retrieving revision 1.28
diff -u -r1.28 zh_CN.po
--- po/zh_CN.po 1 Dec 2005 09:30:41 -0000       1.28
+++ po/zh_CN.po 16 Dec 2005 12:04:38 -0000
@@ -922,7 +922,7 @@
 msgid "Always On Top"
 msgstr "置顶"
 
-#: src/bin/e_int_border_menu.c:50 src/modules/clock/e_mod_main.c:349
+#: src/bin/e_int_border_menu.c:50
 #: src/modules/pager/e_mod_main.c:458
 msgid "Normal"
 msgstr "正常"
@@ -1376,6 +1376,10 @@
 msgid "No Digital Display"
 msgstr "无数字显示"
 
+#: src/modules/clock/e_mod_main.c:349
+msgid "12 Hour"
+msgstr "12小时"
+
 #: src/modules/clock/e_mod_main.c:360
 msgid "24 Hour"
 msgstr "24小时"
Index: po/zh_TW.po
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/po/zh_TW.po,v
retrieving revision 1.1
diff -u -r1.1 zh_TW.po
--- po/zh_TW.po 16 Nov 2005 03:47:20 -0000      1.1
+++ po/zh_TW.po 16 Dec 2005 12:04:38 -0000
@@ -922,7 +922,7 @@
 msgid "Always On Top"
 msgstr "總是置於頂端"
 
-#: src/bin/e_int_border_menu.c:50 src/modules/clock/e_mod_main.c:349
+#: src/bin/e_int_border_menu.c:50
 #: src/modules/pager/e_mod_main.c:458
 msgid "Normal"
 msgstr "正常"
@@ -1389,6 +1389,10 @@
 msgid "No Digital Display"
 msgstr "無數字時間顯示"
 
+#: src/modules/clock/e_mod_main.c:349
+msgid "12 Hour"
+msgstr "12小時"
+
 #: src/modules/clock/e_mod_main.c:360
 msgid "24 Hour"
 msgstr "24小時"
Index: src/modules/clock/e_mod_main.c
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/clock/e_mod_main.c,v
retrieving revision 1.39
diff -u -r1.39 e_mod_main.c
--- src/modules/clock/e_mod_main.c      24 Sep 2005 13:42:05 -0000      1.39
+++ src/modules/clock/e_mod_main.c      16 Dec 2005 12:04:38 -0000
@@ -23,7 +23,7 @@
 static void    _clock_face_cb_menu_enabled(void *data, E_Menu *m, E_Menu_Item 
*mi);
 static void    _clock_face_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item 
*mi);
 static void    _clock_face_cb_digital_none(void *data, E_Menu *m, E_Menu_Item 
*mi);
-static void    _clock_face_cb_digital_normal(void *data, E_Menu *m, 
E_Menu_Item *mi);
+static void    _clock_face_cb_digital_12hour(void *data, E_Menu *m, 
E_Menu_Item *mi);
 static void    _clock_face_cb_digital_24hour(void *data, E_Menu *m, 
E_Menu_Item *mi);
 
 static int _clock_count;
@@ -33,7 +33,7 @@
 
 const int
        DIGITAL_STYLE_NONE = 0,
-       DIGITAL_STYLE_NORMAL = 1,
+       DIGITAL_STYLE_12HOUR = 1,
        DIGITAL_STYLE_24HOUR = 2
 ;
 
@@ -344,16 +344,16 @@
    }
    e_menu_item_callback_set(mi, _clock_face_cb_digital_none, face);
 
-   /* Show normal time */
+   /* Show 12hour time */
    mi = e_menu_item_new(smn);
-   e_menu_item_label_set(mi, _("Normal"));
+   e_menu_item_label_set(mi, _("12 Hour"));
    e_menu_item_radio_set(mi, 1);
    e_menu_item_radio_group_set(mi, 1);
-   if (face->conf->digitalStyle == DIGITAL_STYLE_NORMAL) {
+   if (face->conf->digitalStyle == DIGITAL_STYLE_12HOUR) {
       e_menu_item_toggle_set(mi, 1);
-      _clock_face_cb_digital_normal(face, smn, mi);
+      _clock_face_cb_digital_12hour(face, smn, mi);
    }
-   e_menu_item_callback_set(mi, _clock_face_cb_digital_normal, face);
+   e_menu_item_callback_set(mi, _clock_face_cb_digital_12hour, face);
 
    /* Show 24hour time */
    mi = e_menu_item_new(smn);
@@ -459,7 +459,7 @@
 }
 
 static void
-_clock_face_cb_digital_normal(void *data, E_Menu *m, E_Menu_Item *mi)
+_clock_face_cb_digital_12hour(void *data, E_Menu *m, E_Menu_Item *mi)
 {
        Clock_Face *face;
        char buf[2];
@@ -468,11 +468,11 @@
 
        memset(buf, 0, sizeof(buf));
 
-       snprintf(buf, sizeof(buf), "%i", DIGITAL_STYLE_NORMAL);
+       snprintf(buf, sizeof(buf), "%i", DIGITAL_STYLE_12HOUR);
 
        edje_object_part_text_set(face->clock_object, "digitalStyle", buf);
 
-       face->conf->digitalStyle = DIGITAL_STYLE_NORMAL;
+       face->conf->digitalStyle = DIGITAL_STYLE_12HOUR;
 
        e_config_save_queue();
 }

Reply via email to