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

4 files changed, 38 insertions, 26 deletions

diff --git a/NEWS b/NEWS
index d6c8ad8f..f9beeb74 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,10 @@
 NEWS
 
+2016/05/24
+added listing of current branch in each repository if it exists
+stoped procesing of web page translation until script check part for web pages is also converted to git
+mga4 removed from database due to EOL, added mga5
+
 2015/01/24
 mga3 removed from database due to EOL, added mga4
 
diff --git a/README b/README
index 394552db..2ab4b2e4 100644
--- a/README
+++ b/README
@@ -19,6 +19,7 @@ FEATURES
 -testing for differences of *.pot file from working copy if required
 -option to exclude all work on web pages translation
 -checking and addition of git configuration
+-list current branch in each repository if it exists
 -searching for new *.pot files in svn (TODO also search from git)
 
 
@@ -79,7 +80,7 @@ D. commit it.
 
 
 TODO
-convert web resources to git
+convert web resources to git. Online workaround is https://www.mageia.org/langs/report.php
 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 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/"
diff --git a/translation_projects.dat b/translation_projects.dat
index 839d50fb..53963be1 100644
--- a/translation_projects.dat
+++ b/translation_projects.dat
@@ -1,4 +1,4 @@
-# database for script check_for_translation_work.sh 2015-12-26 15:51:00 UTC filip
+# database for script check_for_translation_work.sh 2016-05-24 20:10:00 UTC filip
 
 # GIT ADDRESSES
 # Repositories of resources for Cauldron and the next released version of Mageia
@@ -44,12 +44,12 @@ if [ -z "$work_on_desktop_files" ]; then
     git_addresses[draklive-config]="software/build-system/draklive-config"
 fi
 
-# 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
+# REPOSITORIES OF RESOURCES BRANCHED FOR MAGEIA 5 (git clone --single-branch)
+if [ -z "$work_on_mga5" ]; then
+    git_addresses[drakx_mga5]="software/drakx -b distro/mga5" # added 24. may 2016
+    git_addresses[msec_mga5]="software/msec -b distro/mga5" # added 24. may 2016
+    git_addresses[mageia-xfce-config_mga5]="software/desktop/xfce/config -b distro/mga5" # added 24. may 2016
+    git_addresses[urpmi_mga5]="software/rpm/urpmi -b distro/mga5" # added 24. may 2016
 fi
 
 # UNOFFICIAL LIST OF REPOSITORIES OF OTHER RESOURCES FOR TRANSLATION
@@ -102,12 +102,13 @@ if [ -z "$work_on_docs_and_tools" ]; then
     translate_projects_po[doc_stylesheets]="docs_and_tools/docs/stylesheets/po"
 fi
 
-# REPOSITORIES OF RESOURCES BRANCHED FOR MAGEIA 4
-if [ -z "$work_on_mga4" ]; then
-    translate_projects_po[drakx_install_mga4]="drakx_mga4/perl-install/install/share/po"
-    translate_projects_po[drakx_share_mga4]="drakx_mga4/perl-install/share/po"
-    translate_projects_po[drakx_standalone_mga4]="drakx_mga4/perl-install/standalone/po"
-    translate_projects_po[rpmdrake_mga4]="rpmdrake_mga4/po"
+# REPOSITORIES OF RESOURCES BRANCHED FOR MAGEIA 5
+if [ -z "$work_on_mga5" ]; then
+    translate_projects_po[drakx_install_mga5]="drakx_mga5/perl-install/install/share/po"
+    translate_projects_po[drakx_share_mga5]="drakx_mga5/perl-install/share/po"
+    translate_projects_po[drakx_standalone_mga5]="drakx_mga5/perl-install/standalone/po"
+    translate_projects_po[msec_mga5]="msec_mga5/po"
+    translate_projects_po[urpmi_mga5]="urpmi_mga5/po"
 fi
 
 # UNOFFICIAL LIST OF REPOSITORIES OF OTHER RESOURCES FOR TRANSLATION
@@ -163,14 +164,12 @@ if [ -z "$work_on_desktop_files" ]; then
     translate_projects_desktop[mageia-xfce-web-browser]="mageia-xfce-config/data/xfce4/panel/launcher-8/web-browser.desktop"
 #   no translations?? mgaonline/trunk/x-mga-exec.desktop
 
-    if [ -z "$work_on_mga4" ]; then
-        translate_projects_desktop[mageia-kde-classicPanel_mga4]="mageia-kde-config_mga4/kde4-profiles/Default/share/apps/plasma/layout-templates/org.mageia.plasma-desktop.classicPanel/metadata.desktop"
-        translate_projects_desktop[mageia-kde-defaultPanel_mga4]="mageia-kde-config_mga4/kde4-profiles/Default/share/apps/plasma/layout-templates/org.mageia.plasma-desktop.defaultPanel/metadata.desktop"
-        translate_projects_desktop[mageia-xfce-file-manager_mga4]="mageia-xfce-config_mga4/data/xfce4/panel/launcher-6/file-manager.desktop"
-        translate_projects_desktop[mageia-xfce-mcc_mga4]="mageia-xfce-config_mga4/data/xfce4/panel/launcher-9/mcc.desktop"
-        translate_projects_desktop[mageia-xfce-terminal-emulator_mga4]="mageia-xfce-config_mga4/data/xfce4/panel/launcher-4/terminal-emulator.desktop"
-        translate_projects_desktop[mageia-xfce-text-editor_mga4]="mageia-xfce-config_mga4/data/xfce4/panel/launcher-5/text-editor.desktop"
-        translate_projects_desktop[mageia-xfce-web-browser_mga4]="mageia-xfce-config_mga4/data/xfce4/panel/launcher-8/web-browser.desktop"
+    if [ -z "$work_on_mga5" ]; then
+        translate_projects_desktop[mageia-xfce-file-manager_mga5]="mageia-xfce-config_mga5/data/xfce4/panel/launcher-6/file-manager.desktop"
+        translate_projects_desktop[mageia-xfce-mcc_mga5]="mageia-xfce-config_mga5/data/xfce4/panel/launcher-9/mcc.desktop"
+        translate_projects_desktop[mageia-xfce-terminal-emulator_mga5]="mageia-xfce-config_mga5/data/xfce4/panel/launcher-4/terminal-emulator.desktop"
+        translate_projects_desktop[mageia-xfce-text-editor_mga5]="mageia-xfce-config_mga5/data/xfce4/panel/launcher-5/text-editor.desktop"
+        translate_projects_desktop[mageia-xfce-web-browser_mga5]="mageia-xfce-config_mga5/data/xfce4/panel/launcher-8/web-browser.desktop"
     fi
 fi
 
@@ -193,6 +192,7 @@ fi
 
 
 #    WEB PAGES:
+if [ -z 1 ]; then # useless until script check part for web pages is also converted to git
 web_pages[web_page_navigation]="svn.mageia.org/svn/web/www/trunk/_nav/langs"
 web_pages[web_page_navigation_2]="svn.mageia.org/svn/web/nav/langs"
 web_pages[web_page_english]="svn.mageia.org/svn/web/www/trunk/en"
@@ -204,3 +204,4 @@ if [ $checkout_whole_website -eq 1 ]; then
     web_pages[web_mognase]="svn.mageia.org/svn/web/nav"
     web_pages[web]="svn.mageia.org/svn/web/www/trunk"
 fi
+fi