From 825d265efd33da2c0d6b22fa9e9e88e97ad33086 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.ath.cx>
Date: Fri, 24 Dec 2010 09:33:21 +0000
Subject: [PATCH] Patch by Mike Roll as part of GCI: Localize Time preflet.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39935 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/preferences/time/Jamfile        |  7 +++++++
 src/preferences/time/Time.cpp       | 11 +++++++----
 src/preferences/time/TimeWindow.cpp |  9 ++++++---
 src/preferences/time/ZoneView.cpp   | 21 +++++++++++++++------
 4 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/src/preferences/time/Jamfile b/src/preferences/time/Jamfile
index eeea76fb1c..1735f30e4a 100644
--- a/src/preferences/time/Jamfile
+++ b/src/preferences/time/Jamfile
@@ -32,3 +32,10 @@ Preference Time
 	: Time.rdef
 	;
 
+DoCatalogs Time :
+	x-vnd.Haiku-Time
+	:
+	Time.cpp
+	TimeWindow.cpp
+	ZoneView.cpp
+	;
diff --git a/src/preferences/time/Time.cpp b/src/preferences/time/Time.cpp
index 95769f13ce..c379b37806 100644
--- a/src/preferences/time/Time.cpp
+++ b/src/preferences/time/Time.cpp
@@ -13,10 +13,12 @@
 
 
 #include <Alert.h>
-
+#include <Catalog.h>
 
 #include <unistd.h>
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "Time"
 
 const char* kAppSignature = "application/x-vnd.Haiku-Time";
 
@@ -44,9 +46,10 @@ TimeApplication::ReadyToRun()
 void
 TimeApplication::AboutRequested()
 {
-	BAlert* alert = new BAlert("about",
-		"Time & Date, writen by:\n\n\tAndrew Edward McCall\n\tMike Berg\n\t"
-		"Julun\n\tPhilippe Saint-Pierre\n\nCopyright 2004-2008, Haiku.", "OK");
+	BAlert* alert = new BAlert(B_TRANSLATE("about"),
+		B_TRANSLATE("Time & Date, writen by:\n\n\tAndrew Edward McCall\n\tMike Berg\n\t"
+					"Julun\n\tPhilippe Saint-Pierre\n\nCopyright 2004-2008, Haiku."),
+		B_TRANSLATE("OK"));
 	alert->Go();
 }
 
diff --git a/src/preferences/time/TimeWindow.cpp b/src/preferences/time/TimeWindow.cpp
index f8cf08662b..54f4fb9d47 100644
--- a/src/preferences/time/TimeWindow.cpp
+++ b/src/preferences/time/TimeWindow.cpp
@@ -17,14 +17,17 @@
 
 
 #include <Application.h>
+#include <Catalog.h>
 #include <Message.h>
 #include <Screen.h>
 #include <TabView.h>
 #include <Button.h>
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "Time"
 
 TTimeWindow::TTimeWindow(BRect rect)
-	: BWindow(rect, "Time", B_TITLED_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE)
+	: BWindow(rect, B_TRANSLATE("Time"), B_TITLED_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE)
 {
 	_InitWindow();
 	_AlignWindow();
@@ -116,11 +119,11 @@ TTimeWindow::_InitWindow()
 
 	BTab* tab = new BTab();
 	tabView->AddTab(fDateTimeView, tab);
-	tab->SetLabel("Date & Time");
+	tab->SetLabel(B_TRANSLATE("Date & Time"));
 
 	tab = new BTab();
 	tabView->AddTab(fTimeZoneView, tab);
-	tab->SetLabel("Time zone");
+	tab->SetLabel(B_TRANSLATE("Time zone"));
 
 	fBaseView->AddChild(tabView);
 	tabView->ResizeBy(0.0, tabView->TabHeight());
diff --git a/src/preferences/time/ZoneView.cpp b/src/preferences/time/ZoneView.cpp
index 3cc32f33cc..15abf8b6ec 100644
--- a/src/preferences/time/ZoneView.cpp
+++ b/src/preferences/time/ZoneView.cpp
@@ -20,6 +20,7 @@
 
 #include <AutoDeleter.h>
 #include <Button.h>
+#include <Catalog.h>
 #include <Collator.h>
 #include <Country.h>
 #include <Directory.h>
@@ -51,6 +52,10 @@
 #include "TimeWindow.h"
 
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "Time"
+
+
 using BPrivate::MutableLocaleRoster;
 using BPrivate::ObjectDeleter;
 
@@ -194,7 +199,8 @@ TimeZoneView::GetToolTipAt(BPoint point, BToolTip** _tip)
 	BString toolTip = item->Text();
 	toolTip << '\n' << item->TimeZone().ShortName() << " / "
 			<< item->TimeZone().ShortDaylightSavingName()
-			<< "\nNow: " << nowInTimeZone << " (" << dateInTimeZone << ')';
+			<< B_TRANSLATE("\nNow: ") << nowInTimeZone
+			<< " (" << dateInTimeZone << ')';
 
 	if (fToolTip != NULL)
 		fToolTip->ReleaseReference();
@@ -251,17 +257,20 @@ TimeZoneView::_InitView()
 	frameRight.top = frameLeft.top;
 
 	// Time Displays
-	fCurrent = new TTZDisplay(frameRight, "currentTime", "Current time:");
+	fCurrent = new TTZDisplay(frameRight, "currentTime",
+		B_TRANSLATE("Current time:"));
 	AddChild(fCurrent);
 	fCurrent->ResizeToPreferred();
 
 	frameRight.top = fCurrent->Frame().bottom + 10.0;
-	fPreview = new TTZDisplay(frameRight, "previewTime", "Preview time:");
+	fPreview = new TTZDisplay(frameRight, "previewTime",
+		B_TRANSLATE("Preview time:"));
 	AddChild(fPreview);
 	fPreview->ResizeToPreferred();
 
 	// set button
-	fSetZone = new BButton(frameRight, "setTimeZone", "Set time zone",
+	fSetZone = new BButton(frameRight, "setTimeZone",
+		B_TRANSLATE("Set time zone"),
 		new BMessage(H_SET_TIME_ZONE));
 	AddChild(fSetZone);
 	fSetZone->SetEnabled(false);
@@ -291,7 +300,7 @@ TimeZoneView::_BuildZoneMenu()
 	 */
 	typedef	std::map<BString, TimeZoneListItem*, TimeZoneItemLess> ZoneItemMap;
 	ZoneItemMap zoneMap;
-	const char* kOtherRegion = "<Other>";
+	const char* kOtherRegion = B_TRANSLATE("<Other>");
 	const char* kSupportedRegions[] = {
 		"Africa", "America", "Antarctica", "Arctic", "Asia", "Atlantic",
 		"Australia", "Europe", "Indian", "Pacific", kOtherRegion, NULL
@@ -327,7 +336,7 @@ TimeZoneView::_BuildZoneMenu()
 
 			BString region(zoneID, slashPos);
 
-			if (region == "Etc")
+			if (region == B_TRANSLATE("Etc"))
 				region = kOtherRegion;
 			else if (countryName.Length() == 0) {
 				// skip global timezones from other regions, we are just