Fix bug #70574: Move files to proper locale dir

Closes GH-5940.
php · Aug 7, 2020 · 5be6702 · 5be6702
1 parent 06ade15
commit 5be6702
Show file tree

Hide file tree

Showing 18 changed files with 4 additions and 0 deletions.
diff --git 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/.../tests/locale/en/LC_CTYPE/dgettextTest.mo → ...cale/en_US.UTF-8/LC_CTYPE/dgettextTest.mo b/.../tests/locale/en/LC_CTYPE/dgettextTest.mo → ...cale/en_US.UTF-8/LC_CTYPE/dgettextTest.mo
diff --git a/.../tests/locale/en/LC_CTYPE/dgettextTest.po → ...cale/en_US.UTF-8/LC_CTYPE/dgettextTest.po b/.../tests/locale/en/LC_CTYPE/dgettextTest.po → ...cale/en_US.UTF-8/LC_CTYPE/dgettextTest.po
diff --git a/...locale/en/LC_CTYPE/dgettextTest_switch.mo → ..._US.UTF-8/LC_CTYPE/dgettextTest_switch.mo b/...locale/en/LC_CTYPE/dgettextTest_switch.mo → ..._US.UTF-8/LC_CTYPE/dgettextTest_switch.mo
diff --git a/...locale/en/LC_CTYPE/dgettextTest_switch.po → ..._US.UTF-8/LC_CTYPE/dgettextTest_switch.po b/...locale/en/LC_CTYPE/dgettextTest_switch.po → ..._US.UTF-8/LC_CTYPE/dgettextTest_switch.po
diff --git a/...cale/en/LC_CTYPE/dgettextTest_switched.po → ...S.UTF-8/LC_CTYPE/dgettextTest_switched.po b/...cale/en/LC_CTYPE/dgettextTest_switched.po → ...S.UTF-8/LC_CTYPE/dgettextTest_switched.po
diff --git a/...tests/locale/en/LC_CTYPE/dngettextTest.mo → ...ale/en_US.UTF-8/LC_CTYPE/dngettextTest.mo b/...tests/locale/en/LC_CTYPE/dngettextTest.mo → ...ale/en_US.UTF-8/LC_CTYPE/dngettextTest.mo
diff --git a/...tests/locale/en/LC_CTYPE/dngettextTest.po → ...ale/en_US.UTF-8/LC_CTYPE/dngettextTest.po b/...tests/locale/en/LC_CTYPE/dngettextTest.po → ...ale/en_US.UTF-8/LC_CTYPE/dngettextTest.po
diff --git a/...sts/locale/en/LC_MESSAGES/dgettextTest.mo → ...e/en_US.UTF-8/LC_MESSAGES/dgettextTest.mo b/...sts/locale/en/LC_MESSAGES/dgettextTest.mo → ...e/en_US.UTF-8/LC_MESSAGES/dgettextTest.mo
diff --git a/...sts/locale/en/LC_MESSAGES/dgettextTest.po → ...e/en_US.UTF-8/LC_MESSAGES/dgettextTest.po b/...sts/locale/en/LC_MESSAGES/dgettextTest.po → ...e/en_US.UTF-8/LC_MESSAGES/dgettextTest.po
diff --git a/...ale/en/LC_MESSAGES/dgettextTest_switch.mo → ....UTF-8/LC_MESSAGES/dgettextTest_switch.mo b/...ale/en/LC_MESSAGES/dgettextTest_switch.mo → ....UTF-8/LC_MESSAGES/dgettextTest_switch.mo
diff --git a/...ale/en/LC_MESSAGES/dgettextTest_switch.po → ....UTF-8/LC_MESSAGES/dgettextTest_switch.po b/...ale/en/LC_MESSAGES/dgettextTest_switch.po → ....UTF-8/LC_MESSAGES/dgettextTest_switch.po
diff --git a/...ts/locale/en/LC_MESSAGES/dngettextTest.mo → .../en_US.UTF-8/LC_MESSAGES/dngettextTest.mo b/...ts/locale/en/LC_MESSAGES/dngettextTest.mo → .../en_US.UTF-8/LC_MESSAGES/dngettextTest.mo
diff --git a/...ts/locale/en/LC_MESSAGES/dngettextTest.po → .../en_US.UTF-8/LC_MESSAGES/dngettextTest.po b/...ts/locale/en/LC_MESSAGES/dngettextTest.po → .../en_US.UTF-8/LC_MESSAGES/dngettextTest.po
diff --git a/...t/tests/locale/en/LC_MESSAGES/messages.mo → ...ocale/en_US.UTF-8/LC_MESSAGES/messages.mo b/...t/tests/locale/en/LC_MESSAGES/messages.mo → ...ocale/en_US.UTF-8/LC_MESSAGES/messages.mo
diff --git a/...t/tests/locale/en/LC_MESSAGES/messages.po → ...ocale/en_US.UTF-8/LC_MESSAGES/messages.po b/...t/tests/locale/en/LC_MESSAGES/messages.po → ...ocale/en_US.UTF-8/LC_MESSAGES/messages.po
diff --git a/...t/tests/locale/fi/LC_MESSAGES/messages.mo → ...ests/locale/fi_FI/LC_MESSAGES/messages.mo b/...t/tests/locale/fi/LC_MESSAGES/messages.mo → ...ests/locale/fi_FI/LC_MESSAGES/messages.mo
diff --git a/...t/tests/locale/fi/LC_MESSAGES/messages.po → ...ests/locale/fi_FI/LC_MESSAGES/messages.po b/...t/tests/locale/fi/LC_MESSAGES/messages.po → ...ests/locale/fi_FI/LC_MESSAGES/messages.po