From 130d1a82d274541f08284845fb20545e4d30d3c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Lahmann?= <lahmann@ub.uni-leipzig.de>
Date: Wed, 11 Mar 2015 14:30:33 +0100
Subject: [PATCH] refs #4790: * implemented github/vufind-org/vufind commit
8efbcdb * renamed de-finc.ini files to de.ini * set de as default language in
config.ini
---
local/alpha/languages/{de-finc.ini => de.ini} | 2 +-
local/config/vufind/config.ini | 4 ++--
local/dev/languages/{de-finc.ini => de.ini} | 2 +-
local/languages/{de-finc.ini => de.ini} | 1 -
.../src/VuFind/I18n/Translator/Loader/ExtendedIni.php | 6 ++++--
5 files changed, 8 insertions(+), 7 deletions(-)
rename local/alpha/languages/{de-finc.ini => de.ini} (93%)
rename local/dev/languages/{de-finc.ini => de.ini} (93%)
rename local/languages/{de-finc.ini => de.ini} (99%)
diff --git a/local/alpha/languages/de-finc.ini b/local/alpha/languages/de.ini
similarity index 93%
rename from local/alpha/languages/de-finc.ini
rename to local/alpha/languages/de.ini
index 21b1660c482..6d0ad684ee9 100644
--- a/local/alpha/languages/de-finc.ini
+++ b/local/alpha/languages/de.ini
@@ -8,7 +8,7 @@
; vufind2/local/languages
;
-@parent_ini = "../../languages/de-finc.ini"
+@parent_ini = "../../languages/de.ini"
;
; Add ALPHA-specific customization after this header.
diff --git a/local/config/vufind/config.ini b/local/config/vufind/config.ini
index 440992db7ab..65a23518637 100644
--- a/local/config/vufind/config.ini
+++ b/local/config/vufind/config.ini
@@ -52,7 +52,7 @@ theme = blueprint
;selectable_themes = "standard:Standard Theme,mobile:Mobile Theme"
; Use the browser language setting to set the VuFind language.
browserDetectLanguage = true
-language = de-finc ; default -- more options available in [Languages] below.
+language = de ; default -- more options available in [Languages] below.
locale = de_DE
; Find valid timezone values here:
; http://www.php.net/manual/en/timezones.php
@@ -836,7 +836,7 @@ skip_numeric = true
[Languages]
en = "English" ; American spellings
;en-gb = "English" ; British spellings
-de-finc = "German"
+de = "German"
;es = "Spanish"
;fr = "French"
;it = "Italian"
diff --git a/local/dev/languages/de-finc.ini b/local/dev/languages/de.ini
similarity index 93%
rename from local/dev/languages/de-finc.ini
rename to local/dev/languages/de.ini
index 1005ae7daf0..82610eb5926 100644
--- a/local/dev/languages/de-finc.ini
+++ b/local/dev/languages/de.ini
@@ -8,7 +8,7 @@
; vufind2/local/languages
;
-@parent_ini = "../../languages/de-finc.ini"
+@parent_ini = "../../languages/de.ini"
;
; Add DEV-specific customization after this header.
diff --git a/local/languages/de-finc.ini b/local/languages/de.ini
similarity index 99%
rename from local/languages/de-finc.ini
rename to local/languages/de.ini
index 21c761cb682..a03b05e9b0d 100644
--- a/local/languages/de-finc.ini
+++ b/local/languages/de.ini
@@ -1,4 +1,3 @@
-@parent_ini = "../../../languages/de.ini"
; Formate entsprechend der format_map_de15.properties
Book = Buch
eBook = E-Book
diff --git a/module/VuFind/src/VuFind/I18n/Translator/Loader/ExtendedIni.php b/module/VuFind/src/VuFind/I18n/Translator/Loader/ExtendedIni.php
index 4c6f922b7cc..ae4da2dd6c8 100644
--- a/module/VuFind/src/VuFind/I18n/Translator/Loader/ExtendedIni.php
+++ b/module/VuFind/src/VuFind/I18n/Translator/Loader/ExtendedIni.php
@@ -148,7 +148,9 @@ class ExtendedIni implements FileLoaderInterface
$data = false;
foreach ($this->pathStack as $path) {
if (file_exists($path . '/' . $filename)) {
- $current = $this->languageFileToTextDomain($path . '/' . $filename);
+ $current = $this->loadParentData(
+ $this->languageFileToTextDomain($path . '/' . $filename)
+ );
if ($data === false) {
$data = $current;
} else {
@@ -161,7 +163,7 @@ class ExtendedIni implements FileLoaderInterface
}
// Load parent data, if necessary:
- return $this->loadParentData($data);
+ return $data;
}
/**
--
GitLab