From bb766851222f19592aa19e6678234b3af7dd3497 Mon Sep 17 00:00:00 2001
From: Eike Foken <kontakt@eikefoken.de>
Date: Wed, 21 Sep 2011 02:24:17 +0200
Subject: [PATCH] Clean-up languages

---
 .../language/de_DE/datamapper_lang.php        | 25 -------------------
 .../language/de_DE/form_validation_lang.php   |  1 -
 application/language/de_DE/jobs_lang.php      |  8 ------
 application/language/de_DE/projects_lang.php  | 11 --------
 application/language/de_DE/settings_lang.php  | 12 ---------
 .../language/en_US/datamapper_lang.php        | 21 ----------------
 .../language/en_US/form_validation_lang.php   |  1 -
 application/language/en_US/jobs_lang.php      |  8 ------
 application/language/en_US/projects_lang.php  | 11 --------
 application/language/en_US/settings_lang.php  | 12 ---------
 application/libraries/MY_Form_validation.php  |  6 ++---
 11 files changed, 3 insertions(+), 113 deletions(-)
 delete mode 100644 application/language/de_DE/datamapper_lang.php
 delete mode 100644 application/language/de_DE/jobs_lang.php
 delete mode 100644 application/language/de_DE/projects_lang.php
 delete mode 100644 application/language/de_DE/settings_lang.php
 delete mode 100644 application/language/en_US/datamapper_lang.php
 delete mode 100644 application/language/en_US/jobs_lang.php
 delete mode 100644 application/language/en_US/projects_lang.php
 delete mode 100644 application/language/en_US/settings_lang.php

diff --git a/application/language/de_DE/datamapper_lang.php b/application/language/de_DE/datamapper_lang.php
deleted file mode 100644
index b93e375..0000000
--- a/application/language/de_DE/datamapper_lang.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-$lang['alpha_dash_dot']		= '%s darf nur alpha-numerische Zeichen, Unterstriche, Bindestriche und Punkte enthalten.';
-$lang['alpha_slash_dot']	= '%s darf nur alpha-numerische Zeichen, Unterstriche, Bindestriche, Punkte und Schrägstriche enthalten.';
-$lang['min_date']			= '%s muss größer als %s sein.';
-$lang['max_date']			= '%s muss kleiner als %s sein.';
-$lang['min_size']			= '%s muss größer als %s sein.';
-$lang['max_size']			= '%s muss kleiner als %s sein.';
-$lang['transaction']		= 'Feld %s hatte einen Fehler bei %s.';
-$lang['unique'] 			= '%s ist bereits vorhanden.';
-$lang['unique_pair'] 		= 'Die Kombination von %s und %s ist bereits vergeben.';
-$lang['valid_date']			= '%s muss ein gültiges Datum enthalten.';
-$lang['valid_date_group']	= '%2$s müssen ein gültiges Datum enthalten.';
-$lang['valid_match']		= 'Das Feld %s darf nur %s entsprechen.';
-
-$lang['related_required']	= 'Eine Beziehung des Feldes %s ist erforderlich.';
-$lang['related_min_size']	= 'Eine Beziehung des Feldes %s muss mindestens %s sein.';
-$lang['related_max_size']	= 'Eine Beziehung des Feldes %s darf maximal %s sein.';
-
-$lang['dm_save_rel_failed']	= 'Die Beziehung des Feldes %s ist nicht korrekt definiert.';
-$lang['dm_save_rel_nothis']	= 'Beziehung des Feldes %s: Das Objekt ist nicht gespeichert.';
-$lang['dm_save_rel_noobj']	= 'Beziehung des Feldes %s: Das verwandte Objekt ist nicht gespeichert.';
-
-/* End of file datamapper_lang.php */
-/* Location: ./application/language/german/datamapper_lang.php */
diff --git a/application/language/de_DE/form_validation_lang.php b/application/language/de_DE/form_validation_lang.php
index 71320e4..72c99cf 100644
--- a/application/language/de_DE/form_validation_lang.php
+++ b/application/language/de_DE/form_validation_lang.php
@@ -1,6 +1,5 @@
 <?php
 
-$lang['unique'] = "Ein Projekt mit diesem Namen existiert bereits";
 $lang['required'] = "&quot;%s&quot; ist ein Pflichtfeld.";
 $lang['isset'] = "&quot;%s&quot; muss einen Wert enthalten.";
 $lang['valid_email'] = "&quot;%s&quot; muss eine gültige E-Mail-Adresse enthalten.";
diff --git a/application/language/de_DE/jobs_lang.php b/application/language/de_DE/jobs_lang.php
deleted file mode 100644
index 8239c22..0000000
--- a/application/language/de_DE/jobs_lang.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$lang['done'] = "Fertig";
-$lang['waiting'] = "Warte auf Start...";
-$lang['failed'] = "Fehlgeschlagen";
-
-/* End of file projects_lang.php */
-/* Location: ./application/language/german/jobs_lang.php */
diff --git a/application/language/de_DE/projects_lang.php b/application/language/de_DE/projects_lang.php
deleted file mode 100644
index f14197b..0000000
--- a/application/language/de_DE/projects_lang.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$lang['project_own'] = "Eigenes Projekt";
-$lang['projects_own'] = "Eigene Projekte";
-$lang['project_shared'] = "Für mich freigegeben";
-$lang['projects_shared'] = "Für mich freigegeben";
-$lang['project_public'] = "Öffentliches Projekt";
-$lang['projects_public'] = "Öffentliche Projekte";
-
-/* End of file projects_lang.php */
-/* Location: ./application/language/german/projects_lang.php */
diff --git a/application/language/de_DE/settings_lang.php b/application/language/de_DE/settings_lang.php
deleted file mode 100644
index a7154c4..0000000
--- a/application/language/de_DE/settings_lang.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-$lang['settings'] = "Einstellungen";
-$lang['tab_personal'] = "Persönliche Daten";
-$lang['tab_settings'] = "Einstellungen";
-
-$lang['projects_sortrecently'] = "Projekte nach Zeitpunkt des letzten Zugriffs sortieren";
-$lang['projects_sortrecently_note'] = "Werden die Projekte nach dem Zeitpunkt des letzten Zugriffs sortiert, &quot;rutschen&quot; die selten verwendeten Projekte in der Liste nach unten.";
-$lang['language_select'] = "Sprache";
-
-/* End of file settings_lang.php */
-/* Location: ./application/language/german/settings_lang.php */
diff --git a/application/language/en_US/datamapper_lang.php b/application/language/en_US/datamapper_lang.php
deleted file mode 100644
index 563695d..0000000
--- a/application/language/en_US/datamapper_lang.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-$lang['alpha_dash_dot']		= 'The %s field may only contain alpha-numeric characters, underscores, dashes, and full stops.';
-$lang['alpha_slash_dot']	= 'The %s field may only contain alpha-numeric characters, underscores, dashes, slashes, and full stops.';
-$lang['min_date']		= 'The %s field must be at least %s.';
-$lang['max_date']		= 'The %s field can not exceed %s.';
-$lang['min_size']		= 'The %s field must be at least %s.';
-$lang['max_size']		= 'The %s field can not exceed %s.';
-$lang['transaction']		= 'The %s failed to %s.';
-$lang['unique'] 		= 'The %s you supplied is already taken.';
-$lang['unique_pair'] 		= 'The combination of %s and %s you supplied is already taken.';
-$lang['valid_date']		= 'The %s field must contain a valid date.';
-$lang['valid_date_group']	= 'The %2$s fields must contain a valid date.';
-$lang['valid_match']		= 'The %s field may only be %s.';
-
-$lang['related_required']	= 'The %s relationship is required.';
-$lang['related_min_size']	= 'The %s relationship must be at least %s.';
-$lang['related_max_size']	= 'The %s relationship can not exceed %s.';
-
-/* End of file datamapper_lang.php */
-/* Location: ./application/language/english/datamapper_lang.php */
\ No newline at end of file
diff --git a/application/language/en_US/form_validation_lang.php b/application/language/en_US/form_validation_lang.php
index c57ded2..2b6de99 100644
--- a/application/language/en_US/form_validation_lang.php
+++ b/application/language/en_US/form_validation_lang.php
@@ -1,6 +1,5 @@
 <?php
 
-$lang['unique'] = "A project with this name already exists.";
 $lang['required'] = "The %s field is required.";
 $lang['isset'] = "The %s field must have a value.";
 $lang['valid_email'] = "The %s field must contain a valid email address.";
diff --git a/application/language/en_US/jobs_lang.php b/application/language/en_US/jobs_lang.php
deleted file mode 100644
index d747055..0000000
--- a/application/language/en_US/jobs_lang.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$lang['done'] = "Complete";
-$lang['waiting'] = "Waiting for start...";
-$lang['failed'] = "Failed";
-
-/* End of file projects_lang.php */
-/* Location: ./application/language/english/jobs_lang.php */
diff --git a/application/language/en_US/projects_lang.php b/application/language/en_US/projects_lang.php
deleted file mode 100644
index be59190..0000000
--- a/application/language/en_US/projects_lang.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$lang['project_own'] = "My project";
-$lang['projects_own'] = "My projects";
-$lang['project_shared'] = "Shared project";
-$lang['projects_shared'] = "Shared projects";
-$lang['project_public'] = "Public project";
-$lang['projects_public'] = "Public projects";
-
-/* End of file projects_lang.php */
-/* Location: ./application/language/german/projects_lang.php */
diff --git a/application/language/en_US/settings_lang.php b/application/language/en_US/settings_lang.php
deleted file mode 100644
index 15e80bb..0000000
--- a/application/language/en_US/settings_lang.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-$lang['settings'] = "Settings";
-$lang['tab_personal'] = "Personal Information";
-$lang['tab_settings'] = "Settings";
-
-$lang['projects_sortrecently'] = "Sort projects by date of the last access";
-$lang['projects_sortrecently_note'] = "If the projects are sorted by the data of the last access, the rarely used projects &quot;slip&quot; to the end of the list.";
-$lang['language_select'] = "Language";
-
-/* End of file settings_lang.php */
-/* Location: ./application/language/german/settings_lang.php */
diff --git a/application/libraries/MY_Form_validation.php b/application/libraries/MY_Form_validation.php
index 40c4011..a0bdbde 100644
--- a/application/libraries/MY_Form_validation.php
+++ b/application/libraries/MY_Form_validation.php
@@ -374,7 +374,7 @@ class MY_Form_validation extends CI_Form_validation {
 	 */
 	public function file_size_max($file, $maxSize) {
 		if ($file['size'] > $this->letToBit($maxSize)) {
-			$this->set_message('file_size_max', sprintf(_('The selected file is too big. (Maximum allowed is %s)', $maxSize)));
+			$this->set_message('file_size_max', sprintf(_('The selected file is too big (maximum allowed is %s).', $maxSize)));
 			return false;
 		}
 		return true;
@@ -388,7 +388,7 @@ class MY_Form_validation extends CI_Form_validation {
 	 */
 	public function file_size_min($file, $minSize) {
 		if ($file['size'] < $this->letToBit($minSize)) {
-			$this->set_message('file_size_min', sprintf(_('The selected file is too small. (Minimum allowed is %s)'), $minSize));
+			$this->set_message('file_size_min', sprintf(_('The selected file is too small (minimum required is %s).'), $minSize));
 			return false;
 		}
 		return true;
@@ -431,7 +431,7 @@ class MY_Form_validation extends CI_Form_validation {
 		$file_ext = substr(strtolower($file_ext), 1);
 
 		if (!in_array($file_ext, $exts)) {
-			$this->set_message('file_allowed_type', sprintf(_('The selected files type should be %s.'), $type));
+			$this->set_message('file_allowed_type', sprintf(_("The selected file's type should be %s."), $type));
 			return false;
 		} else {
 			return true;