Author: cazfi Date: Thu Aug 11 14:54:52 2016 New Revision: 33567 URL: http://svn.gna.org/viewcvs/freeciv?rev=33567&view=rev Log: Fixed sorting of language names shown in Windows Installer
Reported by Frank <dunnoob> See bug #24936 Modified: branches/S2_6/win32/installer/create-freeciv-gtk-qt-nsi.sh branches/S2_6/win32/installer/create-freeciv-ruledit-nsi.sh branches/S2_6/win32/installer/create-freeciv-sdl-nsi.sh branches/S2_6/win32/installer/create-freeciv-sdl2-nsi.sh branches/S2_6/win32/installer_msys2/create-freeciv-gtk-qt-nsi.sh branches/S2_6/win32/installer_msys2/create-freeciv-ruledit-nsi.sh branches/S2_6/win32/installer_msys2/create-freeciv-sdl2-nsi.sh Modified: branches/S2_6/win32/installer/create-freeciv-gtk-qt-nsi.sh URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer/create-freeciv-gtk-qt-nsi.sh?rev=33567&r1=33566&r2=33567&view=diff ============================================================================== --- branches/S2_6/win32/installer/create-freeciv-gtk-qt-nsi.sh (original) +++ branches/S2_6/win32/installer/create-freeciv-gtk-qt-nsi.sh Thu Aug 11 14:54:52 2016 @@ -168,7 +168,7 @@ EOF cat ../../bootstrap/langstat_freeciv.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_freeciv.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: branches/S2_6/win32/installer/create-freeciv-ruledit-nsi.sh URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer/create-freeciv-ruledit-nsi.sh?rev=33567&r1=33566&r2=33567&view=diff ============================================================================== --- branches/S2_6/win32/installer/create-freeciv-ruledit-nsi.sh (original) +++ branches/S2_6/win32/installer/create-freeciv-ruledit-nsi.sh Thu Aug 11 14:54:52 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: branches/S2_6/win32/installer/create-freeciv-sdl-nsi.sh URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer/create-freeciv-sdl-nsi.sh?rev=33567&r1=33566&r2=33567&view=diff ============================================================================== --- branches/S2_6/win32/installer/create-freeciv-sdl-nsi.sh (original) +++ branches/S2_6/win32/installer/create-freeciv-sdl-nsi.sh Thu Aug 11 14:54:52 2016 @@ -168,7 +168,7 @@ EOF cat ../../bootstrap/langstat_freeciv.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_freeciv.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: branches/S2_6/win32/installer/create-freeciv-sdl2-nsi.sh URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer/create-freeciv-sdl2-nsi.sh?rev=33567&r1=33566&r2=33567&view=diff ============================================================================== --- branches/S2_6/win32/installer/create-freeciv-sdl2-nsi.sh (original) +++ branches/S2_6/win32/installer/create-freeciv-sdl2-nsi.sh Thu Aug 11 14:54:52 2016 @@ -168,7 +168,7 @@ EOF cat ../../bootstrap/langstat_freeciv.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_freeciv.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: branches/S2_6/win32/installer_msys2/create-freeciv-gtk-qt-nsi.sh URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer_msys2/create-freeciv-gtk-qt-nsi.sh?rev=33567&r1=33566&r2=33567&view=diff ============================================================================== --- branches/S2_6/win32/installer_msys2/create-freeciv-gtk-qt-nsi.sh (original) +++ branches/S2_6/win32/installer_msys2/create-freeciv-gtk-qt-nsi.sh Thu Aug 11 14:54:52 2016 @@ -169,7 +169,7 @@ EOF cat ../../bootstrap/langstat_freeciv.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 @@ -229,7 +229,7 @@ EOF cat ../../bootstrap/langstat_freeciv.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: branches/S2_6/win32/installer_msys2/create-freeciv-ruledit-nsi.sh URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer_msys2/create-freeciv-ruledit-nsi.sh?rev=33567&r1=33566&r2=33567&view=diff ============================================================================== --- branches/S2_6/win32/installer_msys2/create-freeciv-ruledit-nsi.sh (original) +++ branches/S2_6/win32/installer_msys2/create-freeciv-ruledit-nsi.sh Thu Aug 11 14:54:52 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: branches/S2_6/win32/installer_msys2/create-freeciv-sdl2-nsi.sh URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer_msys2/create-freeciv-sdl2-nsi.sh?rev=33567&r1=33566&r2=33567&view=diff ============================================================================== --- branches/S2_6/win32/installer_msys2/create-freeciv-sdl2-nsi.sh (original) +++ branches/S2_6/win32/installer_msys2/create-freeciv-sdl2-nsi.sh Thu Aug 11 14:54:52 2016 @@ -169,7 +169,7 @@ EOF cat ../../bootstrap/langstat_freeciv.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 @@ -247,7 +247,7 @@ EOF cat ../../bootstrap/langstat_freeciv.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 _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits