diff options
Diffstat (limited to 'php-ZendFramework2-glpi.patch')
| -rw-r--r-- | php-ZendFramework2-glpi.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/php-ZendFramework2-glpi.patch b/php-ZendFramework2-glpi.patch deleted file mode 100644 index 5d7ffb9..0000000 --- a/php-ZendFramework2-glpi.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -up Zend/I18n/Translator/Loader/Gettext.php.glpi Zend/I18n/Translator/Loader/Gettext.php ---- library/Zend/I18n/Translator/Loader/Gettext.php.glpi 2013-10-02 09:41:18.572098028 +0200 -+++ library/Zend/I18n/Translator/Loader/Gettext.php 2013-10-02 09:41:56.658244928 +0200 -@@ -127,9 +127,11 @@ class Gettext implements FileLoaderInter - - array_shift($originalString); - -- foreach ($originalString as $string) { -- $textDomain[$string] = ''; -- } -+/// PROBLEM WITH GLPI WHEN singular = plural -+/// opened bug http://framework.zend.com/issues/browse/ZF-11974 -+// foreach ($originalString as $string) { -+// $textDomain[$string] = ''; -+// } - } else { - $textDomain[$originalString[0]] = $translationString[0]; - } -diff -up Zend/I18n/Translator/Translator.php.glpi Zend/I18n/Translator/Translator.php ---- library/Zend/I18n/Translator/Translator.php.glpi 2013-10-02 09:32:05.331918805 +0200 -+++ library/Zend/I18n/Translator/Translator.php 2013-10-02 09:32:42.679067978 +0200 -@@ -403,6 +403,11 @@ class Translator - return ($number == 1 ? $singular : $plural); - } - -+ /// GLPI Hack for languages with 1 plural form (chinese) -+ if (!is_array($translation)) { -+ return $translation; -+ } -+ - $index = $this->messages[$textDomain][$locale] - ->getPluralRule() - ->evaluate($number); |