aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS3
-rw-r--r--README3
-rwxr-xr-xcheck_for_translation_work.sh22
-rw-r--r--translation_projects.dat11
4 files changed, 23 insertions, 16 deletions
diff --git a/NEWS b/NEWS
index 8d877917..d6c8ad8f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
NEWS
+2015/01/24
+mga3 removed from database due to EOL, added mga4
+
2014/02/03
svn upgrade added, if needed after your local distribution upgrade
diff --git a/README b/README
index 2856f356..f697842c 100644
--- a/README
+++ b/README
@@ -78,7 +78,8 @@ D. commit it.
TODO
-add searching for new *.pot files and other resources in git
+convert web resources to git
+add searching for new *.pot files and other resources and their branches in git
better configurability of messages shown
better documentation
diff --git a/check_for_translation_work.sh b/check_for_translation_work.sh
index 13c1e8bb..3121919d 100755
--- a/check_for_translation_work.sh
+++ b/check_for_translation_work.sh
@@ -7,7 +7,7 @@
#
# Filip Komar, 2012, 2013, 2014
# Remco Rijnders, 2012
-# $Id: check_for_translation_work.sh 2014-02-03 16:58:00 UTC filip $
+# $Id: check_for_translation_work.sh 2015-01-24 20:23:00 UTC filip $
#
# Please see git for a list of changes to this script.
#
@@ -68,8 +68,8 @@ copying_po=1
# set copying of web page files with 1
copying_wp=1
-# uncomment next line to exclude work on software resources for mageia 3
-#work_on_mga3=no
+# uncomment next line to exclude work on software resources for mageia 4
+#work_on_mga4=no
# ADVANCED SETTINGS
# set checking syntax of pot files with 1
@@ -291,7 +291,7 @@ do
fi
# checking for fuzzy and untranslated strings in git $language_code.po
- if [ -f $language_code.po ]; then
+ if [ -f "$language_code.po" ]; then
msgattrib $language_code.po --only-fuzzy --no-obsolete | grep . >> /dev/null
if [ $? -eq 0 ]; then
translate_this="yes"
@@ -304,16 +304,16 @@ do
translate_this="yes"
fi
# creating statistics
- if [ -f $language_code.po ]; then
+ if [ -f "$language_code.po" ]; then
statistics_git_po=`LC_ALL=C msgfmt --statistics --verbose $language_code.po -o /dev/null 2>&1 | tail -1`
fi
- if [ -f $pot_filename ]; then
+ if [ -f "$pot_filename" ]; then
statistics_git_pot=`LC_ALL=C msgfmt --statistics --verbose $pot_filename -o /dev/null 2>&1 | tail -1`
fi
# checking the syntax of po file from git if required
if [ $check_po_syntax -eq 1 ]; then
- if [ -f $language_code.po ]; then
+ if [ -f "$language_code.po" ]; then
msgfmt --statistics --verbose -c $language_code.po -o /dev/null 2>&1 | tee -a "$logfile"_this_run.log
else # Automatic test is not possible.
echo "File $language_code.po is not present yet in ${translate_projects_po[$translate_project_name_po]} for msgfmt test. Please translate it and commit & push it to git." | tee -a "$logfile"_this_run.log
@@ -321,7 +321,7 @@ do
fi
# checking the syntax of pot file from git if required
if [ $check_pot_syntax -eq 1 ]; then
- if [ -f $pot_filename ]; then
+ if [ -f "$pot_filename" ]; then
msgfmt -c $pot_filename -o /dev/null 2>&1 | tee -a "$logfile"_this_run.log
else # Automatic test is not possible.
echo "File *.pot is not present in ${translate_projects_po[$translate_project_name_po]}. Please report that on our mailing list." | tee -a "$logfile"_this_run.log
@@ -344,7 +344,7 @@ do
# echo "File $language_code.po is not present yet in ${translate_projects_po[$translate_project_name_po]}. Copying to working directory is not possible." | tee -a "$logfile"_this_run.log
echo -n # nop
fi
- if [ -f $pot_filename ]; then
+ if [ -f "$pot_filename" ]; then
# testing for differences of *.pot file from git and working copy
if [ -f "$working_translations_directory/$translate_project_name_po/$pot_filename" ]; then
diff -q "$git_directory/${translate_projects_po[$translate_project_name_po]}/$pot_filename" "$working_translations_directory/$translate_project_name_po/$pot_filename" | tee -a "$logfile"_this_run.log
@@ -369,7 +369,7 @@ do
rm new_pot_$language_code.po # remove it as it's no good anyway
fi
# comparing new_pot_lang.po from working copy
- if [ -f new_pot_$language_code.po ]; then
+ if [ -f "new_pot_$language_code.po" ]; then
statistics_wd_po=`LC_ALL=C msgfmt --statistics --verbose new_pot_$language_code.po -o /dev/null 2>&1 | tail -1`
# checking for fuzzy and untranslated strings in fresh new_pot_$language_code.po
msgattrib new_pot_$language_code.po --only-fuzzy --no-obsolete 2>&1 | grep . >> /dev/null
@@ -399,7 +399,7 @@ do
echo -n # nop
fi
# comparing git lang.po from working copy lang.po
- if [ -f $language_code.po ]; then
+ if [ -f "$language_code.po" ]; then
diff -q $wip_po_filename $language_code.po | tee -a "$logfile"_this_run.log
diff_exit_status_2=${PIPESTATUS[0]} # this reads and remembers exit status of first command in pipe (diff in this case)
# if [ $? -eq 0 ]; then
diff --git a/translation_projects.dat b/translation_projects.dat
index d6b6438b..eaf25e45 100644
--- a/translation_projects.dat
+++ b/translation_projects.dat
@@ -1,4 +1,4 @@
-# database for script check_for_translation_work.sh 2015-01-24 19:08:00 UTC filip
+# database for script check_for_translation_work.sh 2015-01-24 20:11:00 UTC filip
# GIT ADDRESSES
# Repositories of resources for Cauldron and the next released version of Mageia
@@ -43,9 +43,12 @@ if [ -z "$work_on_desktop_files" ]; then
git_addresses[draklive-config]="software/build-system/draklive-config"
fi
-# REPOSITORIES OF RESOURCES BRANCHED FOR MAGEIA 3 (git clone --single-branch)
-if [ -z "$work_on_mga3" ]; then
- git_addresses[drakx_mga3]="software/drakx -b distro/mga3"
+# REPOSITORIES OF RESOURCES BRANCHED FOR MAGEIA 4 (git clone --single-branch)
+if [ -z "$work_on_mga4" ]; then
+ git_addresses[drakx_mga4]="software/drakx -b distro/mga4" # added 7. nov. 2014
+ git_addresses[rpmdrake_mga4]="software/rpmdrake -b distro/mga4" # added 7. nov. 2014
+ git_addresses[mageia-kde-config_mga4]="software/desktop/kde/config -b distro/mga4" # added 7. nov. 2014
+ git_addresses[mageia-xfce-config_mga4]="software/desktop/xfce/config -b distro/mga4" # added 7. nov. 2014
fi
# UNOFFICIAL LIST OF REPOSITORIES OF OTHER RESOURCES FOR TRANSLATION