summaryrefslogtreecommitdiffstats
path: root/config-db
diff options
context:
space:
mode:
authorOliver Tappe2006-10-14 15:19:19 +0200
committerOliver Tappe2006-10-14 15:19:19 +0200
commite76e31688ef1e2d89941afe0090a3094b717a50d (patch)
treec9763e1f77ffe8be9690864159d672de4cbd39da /config-db
parent* avoid confusing error message about existing lock-file when in fact the script (diff)
downloadcore-e76e31688ef1e2d89941afe0090a3094b717a50d.tar.gz
core-e76e31688ef1e2d89941afe0090a3094b717a50d.tar.xz
core-e76e31688ef1e2d89941afe0090a3094b717a50d.zip
* canonicalization of $LANG is now even more strict in order to be robust
towards differences between 'utf8' and 'utf-8'. * renamed German translation module from de_de_utf_8.pm to de_de_utf8.pm in order to comply with new naming scheme (no '-'). git-svn-id: http://svn.openslx.org/svn/openslx/trunk@464 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'config-db')
-rw-r--r--config-db/OpenSLX/Basics.pm7
-rw-r--r--config-db/OpenSLX/Translations/de_de_utf8.pm (renamed from config-db/OpenSLX/Translations/de_de_utf_8.pm)0
2 files changed, 4 insertions, 3 deletions
diff --git a/config-db/OpenSLX/Basics.pm b/config-db/OpenSLX/Basics.pm
index 7021cb95..fdac05e0 100644
--- a/config-db/OpenSLX/Basics.pm
+++ b/config-db/OpenSLX/Basics.pm
@@ -183,7 +183,8 @@ sub openslxInit
sub trInit
{
my $locale = $openslxConfig{'locale'};
- $locale =~ tr[A-Z.\-][a-z__];
+ $locale =~ tr[A-Z.][a-z_];
+ $locale =~ tr[\-][]d;
my $trModule = "OpenSLX::Translations::$locale";
if ($loadedTranslationModule eq $trModule) {
@@ -196,7 +197,7 @@ sub trInit
if (eval "require OpenSLX::Translations::posix") {
%translations = %OpenSLX::Translations::posix::translations;
} else {
- carp "Unable to load translations module 'posix' ($!).";
+ vlog 1, "Unable to load translations module 'posix' ($!).";
}
if ($locale ne 'posix') {
@@ -213,7 +214,7 @@ sub trInit
vlog 1, _tr("translations module %s loaded successfully",
$trModule);
} else {
- carp "Unable to load translations module '$locale' ($!).";
+ vlog 1, "Unable to load translations module '$locale' ($!).";
}
}
diff --git a/config-db/OpenSLX/Translations/de_de_utf_8.pm b/config-db/OpenSLX/Translations/de_de_utf8.pm
index b5cdd679..b5cdd679 100644
--- a/config-db/OpenSLX/Translations/de_de_utf_8.pm
+++ b/config-db/OpenSLX/Translations/de_de_utf8.pm