Author: cazfi
Date: Sat Jan 2 18:00:20 2016
New Revision: 31306
URL: http://svn.gna.org/viewcvs/freeciv?rev=31306&view=rev
Log:
Show translation percentages on client Windows Installer language lists.
Ruledit Installer does not have these percentages.
Requested by Jacob Nevins <jtn>
See patch #5931
Modified:
branches/S2_6/win32/installer/Makefile
branches/S2_6/win32/installer/create-freeciv-gtk-qt-nsi.sh
branches/S2_6/win32/installer/create-freeciv-sdl-nsi.sh
Modified: branches/S2_6/win32/installer/Makefile
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer/Makefile?rev=31306&r1=31305&r2=31306&view=diff
==============================================================================
--- branches/S2_6/win32/installer/Makefile (original)
+++ branches/S2_6/win32/installer/Makefile Sat Jan 2 18:00:20 2016
@@ -57,6 +57,8 @@
cd build-$(GUI); ../../../configure --enable-client=$(GUI)
--with-followtag="win32-S2_6" --enable-fcdb=sqlite3 --enable-fcmp=$(FCMP)
$(EXTRA_CONFIG)
# make
make -C build-$(GUI)
+ make -C build-$(GUI)/translations/freeciv update-po
+ make -C build-$(GUI)/bootstrap langstat.txt
build-freeciv-ruledit:
# create build directory
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=31306&r1=31305&r2=31306&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 Sat Jan 2
18:00:20 2016
@@ -163,16 +163,16 @@
### additional languages ###
cat <<EOF
-SectionGroup "Additional languages"
-
-EOF
-
-cat ../../bootstrap/langnames.txt |
+SectionGroup "Additional languages (translation %)"
+
+EOF
+
+cat ../../bootstrap/langstat.txt |
sort -k 2 |
-while read -r code name
+while read -r code prct name
do
if test -e $1/share/locale/$code/LC_MESSAGES/freeciv.mo; then
-echo " Section \"$name ($code)\""
+echo " Section \"$name ($code) $prct\""
echo " SetOutPath \$INSTDIR\\share\\locale\\$code"
echo " File /r $1\\share\\locale\\$code\*.*"
echo " SetOutPath \$INSTDIR"
@@ -227,12 +227,12 @@
\${NSD_CB_AddString} \$DefaultLanguageDropList "US English (en_US)"
EOF
- cat ../../bootstrap/langnames.txt |
+ cat ../../bootstrap/langstat.txt |
sort -k 2 |
- while read -r code name
+ while read -r code prct name
do
if test -e $1/share/locale/$code/LC_MESSAGES/freeciv.mo; then
- echo " \${NSD_CB_AddString} \$DefaultLanguageDropList \"$name ($code)\""
+ echo " \${NSD_CB_AddString} \$DefaultLanguageDropList \"$name ($code)
$prct\""
fi
done
@@ -251,10 +251,10 @@
echo " StrCpy \$DefaultLanguageCode \"en_US\""
echo " \${EndIf}"
- cat ../../bootstrap/langnames.txt |
- while read -r code name
+ cat ../../bootstrap/langstat.txt |
+ while read -r code prct name
do
- echo " \${If} \$LangName == \"$name ($code)\""
+ echo " \${If} \$LangName == \"$name ($code) $prct\""
echo " StrCpy \$DefaultLanguageCode \"$code\""
echo " \${EndIf}"
done
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=31306&r1=31305&r2=31306&view=diff
==============================================================================
--- branches/S2_6/win32/installer/create-freeciv-sdl-nsi.sh (original)
+++ branches/S2_6/win32/installer/create-freeciv-sdl-nsi.sh Sat Jan 2
18:00:20 2016
@@ -163,16 +163,16 @@
### additional languages ###
cat <<EOF
-SectionGroup "Additional languages"
-
-EOF
-
-cat ../../bootstrap/langnames.txt |
+SectionGroup "Additional languages (translation %)"
+
+EOF
+
+cat ../../bootstrap/langstat.txt |
sort -k 2 |
-while read -r code name
+while read -r code prct name
do
if test -e $1/share/locale/$code/LC_MESSAGES/freeciv.mo; then
-echo " Section \"$name ($code)\""
+echo " Section \"$name ($code) $prct\""
echo " SetOutPath \$INSTDIR\\share\\locale\\$code"
echo " File /r $1\\share\\locale\\$code\*.*"
@@ -245,12 +245,12 @@
\${NSD_CB_AddString} \$DefaultLanguageDropList "US English (en_US)"
EOF
- cat ../../bootstrap/langnames.txt |
+ cat ../../bootstrap/langstat.txt |
sort -k 2 |
- while read -r code name
+ while read -r code prct name
do
if test -e $1/share/locale/$code/LC_MESSAGES/freeciv.mo; then
- echo " \${NSD_CB_AddString} \$DefaultLanguageDropList \"$name ($code)\""
+ echo " \${NSD_CB_AddString} \$DefaultLanguageDropList \"$name ($code)
$prct\""
fi
done
@@ -269,10 +269,10 @@
echo " StrCpy \$DefaultLanguageCode \"en_US\""
echo " \${EndIf}"
- cat ../../bootstrap/langnames.txt |
- while read -r code name
+ cat ../../bootstrap/langstat.txt |
+ while read -r code prct name
do
- echo " \${If} \$LangName == \"$name ($code)\""
+ echo " \${If} \$LangName == \"$name ($code) $prct\""
echo " StrCpy \$DefaultLanguageCode \"$code\""
echo " \${EndIf}"
done
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
