Author: cazfi
Date: Thu Aug 11 14:54:45 2016
New Revision: 33566
URL: http://svn.gna.org/viewcvs/freeciv?rev=33566&view=rev
Log:
Fixed sorting of language names shown in Windows Installer
Reported by Frank <dunnoob>
See bug #24936
Modified:
trunk/windows/installer/create-freeciv-gtk-qt-nsi.sh
trunk/windows/installer/create-freeciv-ruledit-nsi.sh
trunk/windows/installer/create-freeciv-sdl2-nsi.sh
trunk/windows/installer_msys2/create-freeciv-gtk-qt-nsi.sh
trunk/windows/installer_msys2/create-freeciv-ruledit-nsi.sh
trunk/windows/installer_msys2/create-freeciv-sdl2-nsi.sh
Modified: trunk/windows/installer/create-freeciv-gtk-qt-nsi.sh
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/windows/installer/create-freeciv-gtk-qt-nsi.sh?rev=33566&r1=33565&r2=33566&view=diff
==============================================================================
--- trunk/windows/installer/create-freeciv-gtk-qt-nsi.sh (original)
+++ trunk/windows/installer/create-freeciv-gtk-qt-nsi.sh Thu Aug 11
14:54:45 2016
@@ -168,7 +168,7 @@
EOF
cat ../../bootstrap/langstat_core.txt |
-sort -k 2 |
+sort -k 1 |
while read -r code prct name
do
if test -e $1/share/locale/$code/LC_MESSAGES/freeciv.mo; then
@@ -228,7 +228,7 @@
EOF
cat ../../bootstrap/langstat_core.txt |
- sort -k 2 |
+ sort -k 1 |
while read -r code prct name
do
if test -e $1/share/locale/$code/LC_MESSAGES/freeciv.mo; then
Modified: trunk/windows/installer/create-freeciv-ruledit-nsi.sh
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/windows/installer/create-freeciv-ruledit-nsi.sh?rev=33566&r1=33565&r2=33566&view=diff
==============================================================================
--- trunk/windows/installer/create-freeciv-ruledit-nsi.sh (original)
+++ trunk/windows/installer/create-freeciv-ruledit-nsi.sh Thu Aug 11
14:54:45 2016
@@ -167,7 +167,7 @@
EOF
cat ../../bootstrap/langstat_ruledit.txt |
-sort -k 2 |
+sort -k 1 |
while read -r code prct name
do
if test -e $1/share/locale/$code/LC_MESSAGES/freeciv-ruledit.mo; then
@@ -227,7 +227,7 @@
EOF
cat ../../bootstrap/langstat_ruledit.txt |
- sort -k 2 |
+ sort -k 1 |
while read -r code prct name
do
if test -e $1/share/locale/$code/LC_MESSAGES/freeciv-ruledit.mo; then
Modified: trunk/windows/installer/create-freeciv-sdl2-nsi.sh
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/windows/installer/create-freeciv-sdl2-nsi.sh?rev=33566&r1=33565&r2=33566&view=diff
==============================================================================
--- trunk/windows/installer/create-freeciv-sdl2-nsi.sh (original)
+++ trunk/windows/installer/create-freeciv-sdl2-nsi.sh Thu Aug 11 14:54:45 2016
@@ -168,7 +168,7 @@
EOF
cat ../../bootstrap/langstat_core.txt |
-sort -k 2 |
+sort -k 1 |
while read -r code prct name
do
if test -e $1/share/locale/$code/LC_MESSAGES/freeciv.mo; then
@@ -246,7 +246,7 @@
EOF
cat ../../bootstrap/langstat_core.txt |
- sort -k 2 |
+ sort -k 1 |
while read -r code prct name
do
if test -e $1/share/locale/$code/LC_MESSAGES/freeciv.mo; then
Modified: trunk/windows/installer_msys2/create-freeciv-gtk-qt-nsi.sh
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/windows/installer_msys2/create-freeciv-gtk-qt-nsi.sh?rev=33566&r1=33565&r2=33566&view=diff
==============================================================================
--- trunk/windows/installer_msys2/create-freeciv-gtk-qt-nsi.sh (original)
+++ trunk/windows/installer_msys2/create-freeciv-gtk-qt-nsi.sh Thu Aug 11
14:54:45 2016
@@ -169,7 +169,7 @@
EOF
cat ../../bootstrap/langstat_core.txt |
-sort -k 2 |
+sort -k 1 |
while read -r code prct name
do
if test -e $1/share/locale/$code/LC_MESSAGES/freeciv-core.mo; then
@@ -229,7 +229,7 @@
EOF
cat ../../bootstrap/langstat_core.txt |
- sort -k 2 |
+ sort -k 1 |
while read -r code prct name
do
if test -e $1/share/locale/$code/LC_MESSAGES/freeciv-core.mo; then
Modified: trunk/windows/installer_msys2/create-freeciv-ruledit-nsi.sh
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/windows/installer_msys2/create-freeciv-ruledit-nsi.sh?rev=33566&r1=33565&r2=33566&view=diff
==============================================================================
--- trunk/windows/installer_msys2/create-freeciv-ruledit-nsi.sh (original)
+++ trunk/windows/installer_msys2/create-freeciv-ruledit-nsi.sh Thu Aug 11
14:54:45 2016
@@ -168,7 +168,7 @@
EOF
cat ../../bootstrap/langstat_ruledit.txt |
-sort -k 2 |
+sort -k 1 |
while read -r code prct name
do
if test -e $1/share/locale/$code/LC_MESSAGES/freeciv-ruledit.mo; then
@@ -228,7 +228,7 @@
EOF
cat ../../bootstrap/langstat_ruledit.txt |
- sort -k 2 |
+ sort -k 1 |
while read -r code prct name
do
if test -e $1/share/locale/$code/LC_MESSAGES/freeciv-ruledit.mo; then
Modified: trunk/windows/installer_msys2/create-freeciv-sdl2-nsi.sh
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/windows/installer_msys2/create-freeciv-sdl2-nsi.sh?rev=33566&r1=33565&r2=33566&view=diff
==============================================================================
--- trunk/windows/installer_msys2/create-freeciv-sdl2-nsi.sh (original)
+++ trunk/windows/installer_msys2/create-freeciv-sdl2-nsi.sh Thu Aug 11
14:54:45 2016
@@ -169,7 +169,7 @@
EOF
cat ../../bootstrap/langstat_core.txt |
-sort -k 2 |
+sort -k 1 |
while read -r code prct name
do
if test -e $1/share/locale/$code/LC_MESSAGES/freeciv-core.mo; then
@@ -247,7 +247,7 @@
EOF
cat ../../bootstrap/langstat_core.txt |
- sort -k 2 |
+ sort -k 1 |
while read -r code prct name
do
if test -e $1/share/locale/$code/LC_MESSAGES/freeciv-core.mo; then
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
