Fix bug #70574: Move files to proper locale dir

Closes GH-5940.

diff --git a/NEWS b/NEWS
index 70e9fc32069e9023116c1b991d131abba8a8265c..23d95ac78c9000d41cadc41abac126ae56fa0f70 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,10 @@ PHP                                                                        NEWS
   . Fixed bug #79934 (CRLF-only line in heredoc causes parsing error).
     (Pieter van den Ham)
 
+- Gettext:
+  . Fixed bug #70574 (Tests fail due to relying on Linux fallback behavior for
+    gettext()). (Florian Engelhardt)
+
 - LDAP:
   . Fixed memory leaks. (ptomulik)
 

diff --git a/ext/gettext/tests/locale/en/LC_CTYPE/dgettextTest.mo b/ext/gettext/tests/locale/en_US.UTF-8/LC_CTYPE/dgettextTest.mo
similarity index 100%
rename from ext/gettext/tests/locale/en/LC_CTYPE/dgettextTest.mo
rename to ext/gettext/tests/locale/en_US.UTF-8/LC_CTYPE/dgettextTest.mo

diff --git a/ext/gettext/tests/locale/en/LC_CTYPE/dgettextTest.po b/ext/gettext/tests/locale/en_US.UTF-8/LC_CTYPE/dgettextTest.po
similarity index 100%
rename from ext/gettext/tests/locale/en/LC_CTYPE/dgettextTest.po
rename to ext/gettext/tests/locale/en_US.UTF-8/LC_CTYPE/dgettextTest.po

diff --git a/ext/gettext/tests/locale/en/LC_CTYPE/dgettextTest_switch.mo b/ext/gettext/tests/locale/en_US.UTF-8/LC_CTYPE/dgettextTest_switch.mo
similarity index 100%
rename from ext/gettext/tests/locale/en/LC_CTYPE/dgettextTest_switch.mo
rename to ext/gettext/tests/locale/en_US.UTF-8/LC_CTYPE/dgettextTest_switch.mo

diff --git a/ext/gettext/tests/locale/en/LC_CTYPE/dgettextTest_switch.po b/ext/gettext/tests/locale/en_US.UTF-8/LC_CTYPE/dgettextTest_switch.po
similarity index 100%
rename from ext/gettext/tests/locale/en/LC_CTYPE/dgettextTest_switch.po
rename to ext/gettext/tests/locale/en_US.UTF-8/LC_CTYPE/dgettextTest_switch.po

diff --git a/ext/gettext/tests/locale/en/LC_CTYPE/dgettextTest_switched.po b/ext/gettext/tests/locale/en_US.UTF-8/LC_CTYPE/dgettextTest_switched.po
similarity index 100%
rename from ext/gettext/tests/locale/en/LC_CTYPE/dgettextTest_switched.po
rename to ext/gettext/tests/locale/en_US.UTF-8/LC_CTYPE/dgettextTest_switched.po

diff --git a/ext/gettext/tests/locale/en/LC_CTYPE/dngettextTest.mo b/ext/gettext/tests/locale/en_US.UTF-8/LC_CTYPE/dngettextTest.mo
similarity index 100%
rename from ext/gettext/tests/locale/en/LC_CTYPE/dngettextTest.mo
rename to ext/gettext/tests/locale/en_US.UTF-8/LC_CTYPE/dngettextTest.mo

diff --git a/ext/gettext/tests/locale/en/LC_CTYPE/dngettextTest.po b/ext/gettext/tests/locale/en_US.UTF-8/LC_CTYPE/dngettextTest.po
similarity index 100%
rename from ext/gettext/tests/locale/en/LC_CTYPE/dngettextTest.po
rename to ext/gettext/tests/locale/en_US.UTF-8/LC_CTYPE/dngettextTest.po

diff --git a/ext/gettext/tests/locale/en/LC_MESSAGES/dgettextTest.mo b/ext/gettext/tests/locale/en_US.UTF-8/LC_MESSAGES/dgettextTest.mo
similarity index 100%
rename from ext/gettext/tests/locale/en/LC_MESSAGES/dgettextTest.mo
rename to ext/gettext/tests/locale/en_US.UTF-8/LC_MESSAGES/dgettextTest.mo

diff --git a/ext/gettext/tests/locale/en/LC_MESSAGES/dgettextTest.po b/ext/gettext/tests/locale/en_US.UTF-8/LC_MESSAGES/dgettextTest.po
similarity index 100%
rename from ext/gettext/tests/locale/en/LC_MESSAGES/dgettextTest.po
rename to ext/gettext/tests/locale/en_US.UTF-8/LC_MESSAGES/dgettextTest.po

diff --git a/ext/gettext/tests/locale/en/LC_MESSAGES/dgettextTest_switch.mo b/ext/gettext/tests/locale/en_US.UTF-8/LC_MESSAGES/dgettextTest_switch.mo
similarity index 100%
rename from ext/gettext/tests/locale/en/LC_MESSAGES/dgettextTest_switch.mo
rename to ext/gettext/tests/locale/en_US.UTF-8/LC_MESSAGES/dgettextTest_switch.mo

diff --git a/ext/gettext/tests/locale/en/LC_MESSAGES/dgettextTest_switch.po b/ext/gettext/tests/locale/en_US.UTF-8/LC_MESSAGES/dgettextTest_switch.po
similarity index 100%
rename from ext/gettext/tests/locale/en/LC_MESSAGES/dgettextTest_switch.po
rename to ext/gettext/tests/locale/en_US.UTF-8/LC_MESSAGES/dgettextTest_switch.po

diff --git a/ext/gettext/tests/locale/en/LC_MESSAGES/dngettextTest.mo b/ext/gettext/tests/locale/en_US.UTF-8/LC_MESSAGES/dngettextTest.mo
similarity index 100%
rename from ext/gettext/tests/locale/en/LC_MESSAGES/dngettextTest.mo
rename to ext/gettext/tests/locale/en_US.UTF-8/LC_MESSAGES/dngettextTest.mo

diff --git a/ext/gettext/tests/locale/en/LC_MESSAGES/dngettextTest.po b/ext/gettext/tests/locale/en_US.UTF-8/LC_MESSAGES/dngettextTest.po
similarity index 100%
rename from ext/gettext/tests/locale/en/LC_MESSAGES/dngettextTest.po
rename to ext/gettext/tests/locale/en_US.UTF-8/LC_MESSAGES/dngettextTest.po

diff --git a/ext/gettext/tests/locale/en/LC_MESSAGES/messages.mo b/ext/gettext/tests/locale/en_US.UTF-8/LC_MESSAGES/messages.mo
similarity index 100%
rename from ext/gettext/tests/locale/en/LC_MESSAGES/messages.mo
rename to ext/gettext/tests/locale/en_US.UTF-8/LC_MESSAGES/messages.mo

diff --git a/ext/gettext/tests/locale/en/LC_MESSAGES/messages.po b/ext/gettext/tests/locale/en_US.UTF-8/LC_MESSAGES/messages.po
similarity index 100%
rename from ext/gettext/tests/locale/en/LC_MESSAGES/messages.po
rename to ext/gettext/tests/locale/en_US.UTF-8/LC_MESSAGES/messages.po

diff --git a/ext/gettext/tests/locale/fi/LC_MESSAGES/messages.mo b/ext/gettext/tests/locale/fi_FI/LC_MESSAGES/messages.mo
similarity index 100%
rename from ext/gettext/tests/locale/fi/LC_MESSAGES/messages.mo
rename to ext/gettext/tests/locale/fi_FI/LC_MESSAGES/messages.mo

diff --git a/ext/gettext/tests/locale/fi/LC_MESSAGES/messages.po b/ext/gettext/tests/locale/fi_FI/LC_MESSAGES/messages.po
similarity index 100%
rename from ext/gettext/tests/locale/fi/LC_MESSAGES/messages.po
rename to ext/gettext/tests/locale/fi_FI/LC_MESSAGES/messages.po