[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/4.3/kdebase/workspace
From:       Burkhard Lück <lueck () hube-lueck ! de>
Date:       2009-07-03 8:58:54
Message-ID: 1246611534.193555.9086.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 990760 by lueck:

fix i18n bug in analog-clock + digital-clock
CCBUG:182650

 M  +4 -3      libs/plasmaclock/clockapplet.cpp  
 M  +1 -1      plasma/applets/analog-clock/clock.cpp  
 M  +1 -0      plasma/applets/digital-clock/clock.cpp  


--- branches/KDE/4.3/kdebase/workspace/libs/plasmaclock/clockapplet.cpp \
#990759:990760 @@ -157,12 +157,13 @@
 
     void setPrettyTimezone()
     {
+        QString timezonetranslated = i18n(timezone.toUtf8().data());
         if (timezone == "UTC")  {
-            prettyTimezone = timezone;
+            prettyTimezone = timezonetranslated;
         } else if (!q->isLocalTimezone()) {
-            QStringList tzParts = timezone.split("/", QString::SkipEmptyParts);
+            QStringList tzParts = timezonetranslated.split("/", \
QString::SkipEmptyParts);  if (tzParts.count() == 1) {
-                prettyTimezone = timezone;
+                prettyTimezone = timezonetranslated;
             } else {
                 prettyTimezone = tzParts.value(1);
             }
--- branches/KDE/4.3/kdebase/workspace/plasma/applets/analog-clock/clock.cpp \
#990759:990760 @@ -66,8 +66,8 @@
       m_animateSeconds(false)
 {
     KGlobal::locale()->insertCatalog("libplasmaclock");
+    // this catalog is only used once on the first start of the clock to translate \
the timezone in the configuration file  \
                KGlobal::locale()->insertCatalog("timezones4");
-
     setHasConfigurationInterface(true);
     resize(125, 125);
     setAspectRatioMode(Plasma::Square);
--- branches/KDE/4.3/kdebase/workspace/plasma/applets/digital-clock/clock.cpp \
#990759:990760 @@ -61,6 +61,7 @@
       m_layout(0)
 {
     KGlobal::locale()->insertCatalog("libplasmaclock");
+    // this catalog is only used once on the first start of the clock to translate \
the timezone in the configuration file  \
KGlobal::locale()->insertCatalog("timezones4");  setHasConfigurationInterface(true);
     resize(150, 75);


[prev in list] [next in list] [prev in thread] [next in thread]