From e76e31688ef1e2d89941afe0090a3094b717a50d Mon Sep 17 00:00:00 2001
From: Oliver Tappe
Date: Sat, 14 Oct 2006 13:19:19 +0000
Subject: * 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
---
 config-db/OpenSLX/Basics.pm                   |   7 +-
 config-db/OpenSLX/Translations/de_de_utf8.pm  | 258 ++++++++++++++++++++++++++
 config-db/OpenSLX/Translations/de_de_utf_8.pm | 258 --------------------------
 3 files changed, 262 insertions(+), 261 deletions(-)
 create mode 100644 config-db/OpenSLX/Translations/de_de_utf8.pm
 delete mode 100644 config-db/OpenSLX/Translations/de_de_utf_8.pm

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_utf8.pm b/config-db/OpenSLX/Translations/de_de_utf8.pm
new file mode 100644
index 00000000..b5cdd679
--- /dev/null
+++ b/config-db/OpenSLX/Translations/de_de_utf8.pm
@@ -0,0 +1,258 @@
+# de_de_utf_8.pm - OpenSLX-translations for the German language.
+#
+# (c) 2006 - OpenSLX.com
+#
+# Oliver Tappe <ot@openslx.com>
+#
+package OpenSLX::Translations::de_de_utf_8;
+
+use strict;
+use vars qw(@ISA @EXPORT $VERSION);
+
+use Exporter;
+$VERSION = 0.02;
+@ISA = qw(Exporter);
+
+@EXPORT = qw(%translations);
+
+use vars qw(%translations);
+
+################################################################################
+### Translations
+################################################################################
+
+%translations = (
+	q{NEW:%s doesn't seem to be installed,\nso there is no support for %s available, sorry!\n}
+	=>
+	qq{},
+
+	q{NEW:Can't add column to table <%s> (%s)}
+	=>
+	qq{},
+
+	q{NEW:Can't add columns to table <%s> (%s)}
+	=>
+	qq{},
+
+	q{NEW:Can't change columns in table <%s> (%s)}
+	=>
+	qq{},
+
+	q{NEW:Can't create table <%s> (%s)}
+	=>
+	qq{},
+
+	q{NEW:Can't delete from table <%s> (%s)}
+	=>
+	qq{},
+
+	q{NEW:Can't drop columns from table <%s> (%s)}
+	=>
+	qq{},
+
+	q{NEW:Can't drop table <%s> (%s)}
+	=>
+	qq{},
+
+	q{NEW:Can't execute SQL-statement <%s> (%s)}
+	=>
+	qq{},
+
+	q{NEW:Can't insert into table <%s> (%s)}
+	=>
+	qq{},
+
+	q{NEW:Can't lock ID-file <%s> (%s)}
+	=>
+	qq{},
+
+	q{NEW:Can't open ID-file <%s> (%s)}
+	=>
+	qq{},
+
+	q{NEW:Can't prepare SQL-statement <%s> (%s)}
+	=>
+	qq{},
+
+	q{NEW:Can't rename table <%s> (%s)}
+	=>
+	qq{},
+
+	q{NEW:Can't to seek ID-file <%s> (%s)}
+	=>
+	qq{},
+
+	q{NEW:Can't truncate ID-file <%s> (%s)}
+	=>
+	qq{},
+
+	q{NEW:Can't update ID-file <%s> (%s)}
+	=>
+	qq{},
+
+	q{NEW:Can't update table <%s> (%s)}
+	=>
+	qq{},
+
+	q{NEW:Cannot connect to database <%s> (%s)}
+	=>
+	qq{},
+
+	q{NEW:config-file <%s> has incorrect syntax here:\n\t%s\n}
+	=>
+	qq{},
+
+	q{NEW:copying kernel %s to %s/kernel}
+	=>
+	qq{},
+
+	q{Could not determine schema version of database}
+	=>
+	qq{Die Version des Datenbank-Schemas konnte nicht bestimmt werden},
+
+	q{NEW:Could not load module <%s> (Version <%s> required, but <%s> found)}
+	=>
+	qq{},
+
+	q{NEW:creating tar %s}
+	=>
+	qq{},
+
+	q{NEW:DB matches current schema version %s}
+	=>
+	qq{},
+
+	q{NEW:executing %s}
+	=>
+	qq{},
+
+	q{NEW:exporting client %d:%s}
+	=>
+	qq{},
+
+	q{NEW:exporting system %d:%s}
+	=>
+	qq{},
+
+	q{NEW:generating initialramfs %s/initramfs}
+	=>
+	qq{},
+
+	q{NEW:ignoring unknown key <%s>}
+	=>
+	qq{},
+
+	q{NEW:Lock-file <%s> exists, script is already running.\nPlease remove the logfile and try again if you are sure that no one else is executing this script.}
+	=>
+	qq{},
+
+	q{NEW:merging %s (val=%s)}
+	=>
+	qq{},
+
+	q{NEW:merging from default client...}
+	=>
+	qq{},
+
+	q{NEW:merging from group %d:%s...}
+	=>
+	qq{},
+
+	q{NEW:no}
+	=>
+	qq{},
+
+	q{NEW:Our schema-version is %s, DB is %s, upgrading DB...}
+	=>
+	qq{},
+
+	q{NEW:PXE-system %s already exists!}
+	=>
+	qq{},
+
+	q{NEW:removing %s}
+	=>
+	qq{},
+
+	q{NEW:setting %s to <%s>}
+	=>
+	qq{},
+
+	q{NEW:system-error: illegal target-path <%s>!}
+	=>
+	qq{},
+
+	q{NEW:This will overwrite the current OpenSLX-database with an example dataset.\nAll your data (%s systems and %s clients) will be lost!\nDo you want to continue(%s/%s)? }
+	=>
+	qq{},
+
+	q{NEW:translations module %s loaded successfully}
+	=>
+	qq{},
+
+	q{NEW:Unable to access client-config-path '%s'!}
+	=>
+	qq{},
+
+	q{NEW:Unable to create or access temp-path '%s'!}
+	=>
+	qq{},
+
+	q{NEW:Unable to create or access tftpboot-path '%s'!}
+	=>
+	qq{},
+
+	q{NEW:unable to execute shell-command:\n\t%s \n\t(%s)}
+	=>
+	qq{},
+
+	q{Unable to load DB-module <%s> (%s)}
+	=>
+	qq{Kann DB-Modul <%s> nicht laden (%s)},
+
+	q{NEW:Unable to load module <%s> (Version <%s> required)}
+	=>
+	qq{},
+
+	q{NEW:Unable to load module <%s> (Version <%s> required, but <%s> found)}
+	=>
+	qq{},
+
+	q{NEW:Unable to write local settings file <%s> (%s)}
+	=>
+	qq{},
+
+	q{NEW:UnknownDbSchemaColumnDescr}
+	=>
+	qq{},
+
+	q{UnknownDbSchemaCommand}
+	=>
+	qq{Unbekannter DbSchema-Befehl <%s> wird übergangen},
+
+	q{NEW:UnknownDbSchemaTypeDescr}
+	=>
+	qq{},
+
+	q{NEW:upgrade done}
+	=>
+	qq{},
+
+	q{NEW:writing PXE-file %s}
+	=>
+	qq{},
+
+	q{NEW:yes}
+	=>
+	qq{},
+
+);
+
+1;
+
+
+
+
+
+
+
diff --git a/config-db/OpenSLX/Translations/de_de_utf_8.pm b/config-db/OpenSLX/Translations/de_de_utf_8.pm
deleted file mode 100644
index b5cdd679..00000000
--- a/config-db/OpenSLX/Translations/de_de_utf_8.pm
+++ /dev/null
@@ -1,258 +0,0 @@
-# de_de_utf_8.pm - OpenSLX-translations for the German language.
-#
-# (c) 2006 - OpenSLX.com
-#
-# Oliver Tappe <ot@openslx.com>
-#
-package OpenSLX::Translations::de_de_utf_8;
-
-use strict;
-use vars qw(@ISA @EXPORT $VERSION);
-
-use Exporter;
-$VERSION = 0.02;
-@ISA = qw(Exporter);
-
-@EXPORT = qw(%translations);
-
-use vars qw(%translations);
-
-################################################################################
-### Translations
-################################################################################
-
-%translations = (
-	q{NEW:%s doesn't seem to be installed,\nso there is no support for %s available, sorry!\n}
-	=>
-	qq{},
-
-	q{NEW:Can't add column to table <%s> (%s)}
-	=>
-	qq{},
-
-	q{NEW:Can't add columns to table <%s> (%s)}
-	=>
-	qq{},
-
-	q{NEW:Can't change columns in table <%s> (%s)}
-	=>
-	qq{},
-
-	q{NEW:Can't create table <%s> (%s)}
-	=>
-	qq{},
-
-	q{NEW:Can't delete from table <%s> (%s)}
-	=>
-	qq{},
-
-	q{NEW:Can't drop columns from table <%s> (%s)}
-	=>
-	qq{},
-
-	q{NEW:Can't drop table <%s> (%s)}
-	=>
-	qq{},
-
-	q{NEW:Can't execute SQL-statement <%s> (%s)}
-	=>
-	qq{},
-
-	q{NEW:Can't insert into table <%s> (%s)}
-	=>
-	qq{},
-
-	q{NEW:Can't lock ID-file <%s> (%s)}
-	=>
-	qq{},
-
-	q{NEW:Can't open ID-file <%s> (%s)}
-	=>
-	qq{},
-
-	q{NEW:Can't prepare SQL-statement <%s> (%s)}
-	=>
-	qq{},
-
-	q{NEW:Can't rename table <%s> (%s)}
-	=>
-	qq{},
-
-	q{NEW:Can't to seek ID-file <%s> (%s)}
-	=>
-	qq{},
-
-	q{NEW:Can't truncate ID-file <%s> (%s)}
-	=>
-	qq{},
-
-	q{NEW:Can't update ID-file <%s> (%s)}
-	=>
-	qq{},
-
-	q{NEW:Can't update table <%s> (%s)}
-	=>
-	qq{},
-
-	q{NEW:Cannot connect to database <%s> (%s)}
-	=>
-	qq{},
-
-	q{NEW:config-file <%s> has incorrect syntax here:\n\t%s\n}
-	=>
-	qq{},
-
-	q{NEW:copying kernel %s to %s/kernel}
-	=>
-	qq{},
-
-	q{Could not determine schema version of database}
-	=>
-	qq{Die Version des Datenbank-Schemas konnte nicht bestimmt werden},
-
-	q{NEW:Could not load module <%s> (Version <%s> required, but <%s> found)}
-	=>
-	qq{},
-
-	q{NEW:creating tar %s}
-	=>
-	qq{},
-
-	q{NEW:DB matches current schema version %s}
-	=>
-	qq{},
-
-	q{NEW:executing %s}
-	=>
-	qq{},
-
-	q{NEW:exporting client %d:%s}
-	=>
-	qq{},
-
-	q{NEW:exporting system %d:%s}
-	=>
-	qq{},
-
-	q{NEW:generating initialramfs %s/initramfs}
-	=>
-	qq{},
-
-	q{NEW:ignoring unknown key <%s>}
-	=>
-	qq{},
-
-	q{NEW:Lock-file <%s> exists, script is already running.\nPlease remove the logfile and try again if you are sure that no one else is executing this script.}
-	=>
-	qq{},
-
-	q{NEW:merging %s (val=%s)}
-	=>
-	qq{},
-
-	q{NEW:merging from default client...}
-	=>
-	qq{},
-
-	q{NEW:merging from group %d:%s...}
-	=>
-	qq{},
-
-	q{NEW:no}
-	=>
-	qq{},
-
-	q{NEW:Our schema-version is %s, DB is %s, upgrading DB...}
-	=>
-	qq{},
-
-	q{NEW:PXE-system %s already exists!}
-	=>
-	qq{},
-
-	q{NEW:removing %s}
-	=>
-	qq{},
-
-	q{NEW:setting %s to <%s>}
-	=>
-	qq{},
-
-	q{NEW:system-error: illegal target-path <%s>!}
-	=>
-	qq{},
-
-	q{NEW:This will overwrite the current OpenSLX-database with an example dataset.\nAll your data (%s systems and %s clients) will be lost!\nDo you want to continue(%s/%s)? }
-	=>
-	qq{},
-
-	q{NEW:translations module %s loaded successfully}
-	=>
-	qq{},
-
-	q{NEW:Unable to access client-config-path '%s'!}
-	=>
-	qq{},
-
-	q{NEW:Unable to create or access temp-path '%s'!}
-	=>
-	qq{},
-
-	q{NEW:Unable to create or access tftpboot-path '%s'!}
-	=>
-	qq{},
-
-	q{NEW:unable to execute shell-command:\n\t%s \n\t(%s)}
-	=>
-	qq{},
-
-	q{Unable to load DB-module <%s> (%s)}
-	=>
-	qq{Kann DB-Modul <%s> nicht laden (%s)},
-
-	q{NEW:Unable to load module <%s> (Version <%s> required)}
-	=>
-	qq{},
-
-	q{NEW:Unable to load module <%s> (Version <%s> required, but <%s> found)}
-	=>
-	qq{},
-
-	q{NEW:Unable to write local settings file <%s> (%s)}
-	=>
-	qq{},
-
-	q{NEW:UnknownDbSchemaColumnDescr}
-	=>
-	qq{},
-
-	q{UnknownDbSchemaCommand}
-	=>
-	qq{Unbekannter DbSchema-Befehl <%s> wird übergangen},
-
-	q{NEW:UnknownDbSchemaTypeDescr}
-	=>
-	qq{},
-
-	q{NEW:upgrade done}
-	=>
-	qq{},
-
-	q{NEW:writing PXE-file %s}
-	=>
-	qq{},
-
-	q{NEW:yes}
-	=>
-	qq{},
-
-);
-
-1;
-
-
-
-
-
-
-
-- 
cgit v1.2.3-55-g7522