i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Introducing a catalog app name context, related macros, and making use of this in DeskCalc.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40930 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jonas Sundström
2011-03-13 17:29:10 +00:00
parent 60644e6de6
commit 480d660fb0
4 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/catalogs/apps/deskcalc/sv.catkeys
+2 -2
View File
@@ -1,7 +1,7 @@
1 swedish x-vnd.Haiku-DeskCalc 3960407498
1 swedish x-vnd.Haiku-DeskCalc 168574347
About DeskCalc… CalcView Om Kalkylatorn...
Audio Feedback CalcView Knappljud
DeskCalc Window Kalkylatorn
DeskCalc Application name Kalkylatorn
DeskCalc v2.1.0\n\nwritten by Timothy Wayper,\nStephan Aßmus and Ingo Weinhold\n\n©1997, 1998 R3 Software Ltd.\n©2006-2009 Haiku, Inc.\n\nAll Rights Reserved. CalcView Kalkylatorn v2.1.0\n\nskrivet av Timothy Wayper,\nStephan Aßmus och Ingo Weinhold\n\n©1997, 1998 R3 Software Ltd.\n©2006-2009 Haiku, Inc.\n\nAll Rights Reserved.
Enable Num Lock on startup CalcView Aktivera Num Lock vid start
Show keypad CalcView Visa tangenter
headers/os/locale/Catalog.h
+21
View File
@@ -63,6 +63,10 @@ private:
};
#undef B_TRANSLATE_APP_NAME_CONTEXT
#define B_TRANSLATE_APP_NAME_CONTEXT "Application name"
#ifndef B_COLLECTING_CATKEYS
#ifndef B_AVOID_TRANSLATION_MACROS
@@ -96,6 +100,11 @@ private:
BLocaleRoster::Default()->GetCatalog()->GetString((string), \
B_TRANSLATE_CONTEXT)
#undef B_TRANSLATE_APP_NAME
#define B_TRANSLATE_APP_NAME(string) \
BLocaleRoster::Default()->GetCatalog()->GetString((string), \
B_TRANSLATE_APP_NAME_CONTEXT)
#undef B_TRANSLATE_WITH_CONTEXT
#define B_TRANSLATE_WITH_CONTEXT(string, context) \
BLocaleRoster::Default()->GetCatalog()->GetString((string), (context))
@@ -153,6 +162,10 @@ private:
#define B_TRANSLATE_MARK_ID(id) \
BCatalogAddOn::MarkForTranslation((id))
#undef B_TRANSLATE_MARK_APP_NAME
#define B_TRANSLATE_MARK_APP_NAME(str) \
BCatalogAddOn::MarkForTranslation((str), B_TRANSLATE_APP_NAME_CONTEXT, "")
// Translation macros which do not let collectcatkeys try to collect the key
// (useful in combination with the marking macros above):
#undef B_TRANSLATE_NOCOLLECT
@@ -186,6 +199,10 @@ private:
#define B_TRANSLATE(string) \
B_CATKEY((string), B_TRANSLATE_CONTEXT)
#undef B_TRANSLATE_APP_NAME
#define B_TRANSLATE_APP_NAME(string) \
B_CATKEY((string), B_TRANSLATE_APP_NAME_CONTEXT)
#undef B_TRANSLATE_WITH_CONTEXT
#define B_TRANSLATE_WITH_CONTEXT(string, context) \
B_CATKEY((string), (context))
@@ -218,6 +235,10 @@ private:
#define B_TRANSLATE_MARK_ID(id) \
B_CATKEY((id))
#undef B_TRANSLATE_MARK_APP_NAME
#define B_TRANSLATE_MARK_APP_NAME(str) \
B_CATKEY((str), B_TRANSLATE_APP_NAME_CONTEXT, "")
#undef B_TRANSLATE_NOCOLLECT
#define B_TRANSLATE_NOCOLLECT(str) \
(void)
src/apps/deskcalc/CalcWindow.cpp
+2 -1
View File
@@ -27,7 +27,8 @@
CalcWindow::CalcWindow(BRect frame, BMessage* settings)
: BWindow(frame, B_TRANSLATE("DeskCalc"), B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS)
: BWindow(frame, B_TRANSLATE_APP_NAME("DeskCalc"), B_TITLED_WINDOW,
B_ASYNCHRONOUS_CONTROLS)
{
// create calculator view with calculator description and
// desktop background color
src/apps/deskcalc/DeskCalc.rdef
+1 -1
View File
@@ -1,7 +1,7 @@
resource app_signature "application/x-vnd.Haiku-DeskCalc";
resource app_name_catalog_entry "x-vnd.Haiku-DeskCalc:Window:DeskCalc";
resource app_name_catalog_entry "x-vnd.Haiku-DeskCalc:Application name:DeskCalc";
resource app_version {
major = 2,