From 0f4098c3b05b077b8351e182be7b50f6838e1512 Mon Sep 17 00:00:00 2001 From: filip Date: Tue, 24 May 2016 22:42:41 +0200 Subject: mga4 EOL, added mga5, added listing of current branch + +stoped procesing of web page translation until script check part for web pages is also converted to git --- check_for_translation_work.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'check_for_translation_work.sh') diff --git a/check_for_translation_work.sh b/check_for_translation_work.sh index 3121919d..b2442d65 100755 --- a/check_for_translation_work.sh +++ b/check_for_translation_work.sh @@ -5,9 +5,9 @@ # displaying the project name when your language.po has fuzzy strings or # empty string messages. Also useful for translation of web pages. # -# Filip Komar, 2012, 2013, 2014 +# Filip Komar, 2012 - 2016 # Remco Rijnders, 2012 -# $Id: check_for_translation_work.sh 2015-01-24 20:23:00 UTC filip $ +# $Id: check_for_translation_work.sh 2016-05-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 4 -#work_on_mga4=no +# uncomment next line to exclude work on software resources for mageia 5 +#work_on_mga5=no # ADVANCED SETTINGS # set checking syntax of pot files with 1 @@ -233,6 +233,8 @@ do cd "$git_directory/$git_address" # just echo $language_code.po or *.pot file line if they are updated git pull --stat --rebase -q | grep -E "$language_code.po\>|.pot\>|.desktop\>|.html\>" | tee -a "$logfile"_this_run.log + # list mga5 branch if it exists + git ls-remote --heads origin | grep mga5 | tee -a "$logfile"_this_run.log # git diff --name-status ORIG_HEAD.. | grep -E "$language_code.po|[\.]pot" else echo Clone git repository "${git_addresses[$git_address]}" to "$git_address". | tee -a "$logfile"_this_run.log @@ -640,6 +642,7 @@ if [ -z "$work_on_web_pages_translation" ]; then # copying the english files and $language_code.lang files for editing in working directory if required + copying_wp=0 # stop copying of web page files until script check part for web pages is also converted to git if [ $copying_wp -eq 1 ]; then echo $separator | tee -a "$logfile"_this_run.log echo -e "\E[32m" @@ -662,6 +665,7 @@ if [ -z "$work_on_web_pages_translation" ]; then cp $copy_options ./web_page_navigation/$language_code.lang "$working_translations_directory/web_page_navigation/" | tee -a "$logfile"_this_run.log fi + if [ -z 1 ]; then # useless until script check part for web pages is also converted to git if [ -d "$svn_directory/web_page_navigation/" ]; then if [ -d "$svn_directory/web_page_navigation_2/" ]; then diff -rq "$svn_directory/web_page_navigation" "$svn_directory/web_page_navigation_2" | grep -E ".lang" | tee -a "$logfile"_this_run.log @@ -672,6 +676,7 @@ if [ -z "$work_on_web_pages_translation" ]; then echo "Both navigation directories ($svn_directory/web_page_navigation and $svn_directory/web_page_navigation_2) are not present. Comparing is not possible." | tee -a "$logfile"_this_run.log fi echo "" | tee -a "$logfile"_this_run.log + fi fi cd "$git_directory/" -- cgit v1.2.1