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

Replace the word 'Haiku' in the alert dialogs that appear in Tracker when you

Browse Source 
try to move or rename an important system folder with a macro so that
translators do not try and translate the name of the OS. I struggled
to find a global place where the OS name could be pulled from instead of
using a #define in FSUtils.cpp. I ended up grabbing the system name from the
utsname struct. This is identical to what is outputted by 'uname -s' which is
the word 'Haiku'.

Fixes #8092

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@43197 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
John Scipione
2011-11-06 05:23:23 +00:00
parent 2f99b4911a
commit 88b4c422fe
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/tracker/FSUtils.cpp
+17 -10
View File
@@ -68,6 +68,7 @@ respective holders. All rights reserved.
#include <fs_attr.h>
#include <fs_info.h>
#include <sys/utsname.h>
#include "Attributes.h"
#include "Bitmaps.h"
@@ -633,19 +634,19 @@ ConfirmChangeIfWellKnownDirectory(const BEntry *entry,
if (DirectoryMatchesOrContains(entry, B_SYSTEM_DIRECTORY)) {
warning.SetTo(
B_TRANSLATE("If you %ifYouDoAction the system folder or its "
"contents, you won't be able to boot Haiku! Are you sure you "
"contents, you won't be able to boot %osName! Are you sure you "
"want to do this? To %toDoAction the system folder or its "
"contents anyway, hold down the Shift key and click "
"\"%toConfirmAction\"."));
} else if (DirectoryMatches(entry, B_COMMON_DIRECTORY)) {
warning.SetTo(
B_TRANSLATE("If you %ifYouDoAction the common folder, Haiku "
B_TRANSLATE("If you %ifYouDoAction the common folder, %osName "
"may not behave properly! Are you sure you want to do this? "
"To %toDoAction the common folder anyway, hold down the "
"Shift key and click \"%toConfirmAction\"."));
} else if (DirectoryMatches(entry, B_USER_DIRECTORY)) {
warning .SetTo(
B_TRANSLATE("If you %ifYouDoAction the home folder, Haiku "
B_TRANSLATE("If you %ifYouDoAction the home folder, %osName "
"may not behave properly! Are you sure you want to do this? "
"To %toDoAction the home folder anyway, hold down the "
"Shift key and click \"%toConfirmAction\"."));
@@ -657,14 +658,14 @@ ConfirmChangeIfWellKnownDirectory(const BEntry *entry,
|| DirectoryMatchesOrContains(entry, "beos_mime",
B_COMMON_SETTINGS_DIRECTORY)) {
warning.SetTo(
B_TRANSLATE("If you %ifYouDoAction the mime settings, Haiku "
"may not behave properly! Are you sure you want to do this? "
"To %toDoAction the mime settings anyway, click "
B_TRANSLATE("If you %ifYouDoAction the mime settings, "
"%osName may not behave properly! Are you sure you want to "
"do this? To %toDoAction the mime settings anyway, click "
"\"%toConfirmAction\"."));
requireOverride = false;
} else if (DirectoryMatches(entry, B_USER_CONFIG_DIRECTORY)) {
warning.SetTo(
B_TRANSLATE("If you %ifYouDoAction the config folder, Haiku "
B_TRANSLATE("If you %ifYouDoAction the config folder, %osName "
"may not behave properly! Are you sure you want to do this? "
"To %toDoAction the config folder anyway, click "
"\"%toConfirmAction\"."));
@@ -672,9 +673,9 @@ ConfirmChangeIfWellKnownDirectory(const BEntry *entry,
} else if (DirectoryMatches(entry, B_USER_SETTINGS_DIRECTORY)
|| DirectoryMatches(entry, B_COMMON_SETTINGS_DIRECTORY)) {
warning.SetTo(
B_TRANSLATE("If you %ifYouDoAction the settings folder, Haiku "
"may not behave properly! Are you sure you want to do this? "
"To %toDoAction the settings folder anyway, click "
B_TRANSLATE("If you %ifYouDoAction the settings folder, "
"%osName may not behave properly! Are you sure you want to "
"do this? To %toDoAction the settings folder anyway, click "
"\"%toConfirmAction\"."));
requireOverride = false;
}
@@ -691,6 +692,12 @@ ConfirmChangeIfWellKnownDirectory(const BEntry *entry,
// we already warned about moving home this time around
return true;
struct utsname name;
if (uname(&name) == -1)
warning.ReplaceFirst("%osName", "Haiku");
else
warning.ReplaceFirst("%osName", name.sysname);
warning.ReplaceFirst("%ifYouDoAction", ifYouDoAction);
warning.ReplaceFirst("%toDoAction", toDoAction);
warning.ReplaceFirst("%toConfirmAction", toConfirmAction);