Ticket #5970: bin_dstcheck.patch

src/bin/dstcheck.cpp

@@ -6 +6 @@
 
 #include <Alert.h>
 #include <Application.h>
+#include <Catalog.h>
 #include <FindDirectory.h>
+#include <Locale.h>
 #include <MessageRunner.h>
 #include <Roster.h>
 #include <String.h>
@@ -19 +21 @@
 
 const uint32 TIMEDALERT_UPDATE = 'taup';
 
+#define B_TRANSLATE_CONTEXT "dstcheck"
+
 class TimedAlert : public BAlert {
     public:
         TimedAlert(const char *title, const char *text, const char *button1,
@@ -31 +35 @@
 
     private:
         BMessageRunner *fRunner;
+        BCatalog    fCatalog;
 };
 
 
@@ -67 +72 @@
 void
 TimedAlert::GetLabel(BString &string)
 {
-    string = "Attention!\n\nBecause of the switch from daylight saving time, "
-        "your computer's clock may be an hour off. Currently, your computer "
-        "thinks it is ";
+    string = B_TRANSLATE("Attention!\n\nBecause of the switch from daylight "
+        "saving time, your computer's clock may be an hour off. Currently, "
+        "your computer thinks it is ");
 
     time_t t;
     struct tm tm;
     char timestring[15];
     time(&t);
     localtime_r(&t, &tm);
-    strftime(timestring, 15, "%I:%M %p", &tm);
+    if (be_locale->Country()->IsClock24Hour())
+        strftime(timestring, 15, "%H:%M", &tm);
+    else
+        strftime(timestring, 15, "%I:%M %p", &tm);
     string += timestring;
 
-    string += ".\n\nIs this the correct time?";
+    string += B_TRANSLATE(".\n\nIs this the correct time?");
 }
 
 
@@ -93 +101 @@
     struct tm tm;
     tzset();
     time(&t);
-    localtime_r(&t, &tm);   
+    localtime_r(&t, &tm);
 
     char path[B_PATH_NAME_LENGTH];  
     if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, true, path, B_PATH_NAME_LENGTH) != B_OK) {
@@ -123 +131 @@
 
     if (dst != tm.tm_isdst) {
         BApplication app("application/x-vnd.Haiku-cmd-dstconfig");  
+        be_locale->GetAppCatalog(&fAppCatalog);
 
         BString string;
         TimedAlert::GetLabel(string);
 
-        int32 index = (new TimedAlert("timedAlert", string.String(), "Ask me later", "Yes", "No"))->Go();
+        int32 index = (new TimedAlert("timedAlert", string.String(), 
+            B_TRANSLATE("Ask me later"), B_TRANSLATE("Yes"), 
+            B_TRANSLATE("No")))->Go();
         if (index == 0)
             exit(0);
 
         if (index == 2) {
             index = (new BAlert("dstcheck",
-                "Would you like to set the clock using the Time and\nDate preference utility?", 
-                "No", "Yes"))->Go();
+                B_TRANSLATE("Would you like to set the clock using the Time "
+                    "and\nDate preference utility?"), 
+                B_TRANSLATE("No"), B_TRANSLATE("Yes")))->Go();
 
             if (index == 1)
                 be_roster->Launch("application/x-vnd.Haiku-Time");