Unify names

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@7321 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/debian/rules b/debian/rules
index 23bcd0f62f3b31d0d9f5ce5bcb2d07232224a437..0d1abf8657771eaff10c260f9a9633a5c17e60b6 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -87,11 +87,10 @@ install-stamp:
        -cp -R debian/gosa-desktop.desktop debian/gosa-desktop/usr/share/applications/gosa.desktop
        -rm -rf debian/gosa/usr/share/gosa/contrib
        -rm -rf debian/gosa/usr/share/gosa/locale/en
-       -rm -rf debian/gosa/usr/share/gosa/gen_locale.sh
-       -rm -rf debian/gosa/usr/share/gosa/gen_pdf_help.sh
+       -rm -rf debian/gosa/usr/share/gosa/update-locale
+       -rm -rf debian/gosa/usr/share/gosa/update-pdf-help
        -rm -rf debian/gosa/usr/share/gosa/patch-stamp
-       -rm -rf debian/gosa/usr/share/gosa/gen_online_help.sh
-       -rm -rf debian/gosa/usr/share/gosa/update.sh
+       -rm -rf debian/gosa/usr/share/gosa/update-online-help
        -rm -rf debian/gosa/usr/share/doc/gosa/guide*
        sed 's%"CONFIG_TEMPLATE_DIR", "../contrib/"%"CONFIG_TEMPLATE_DIR", "/usr/share/doc/gosa/contrib/"%g' debian/gosa/usr/share/gosa/include/functions.inc > debian/gosa/usr/share/gosa/include/functions.inc.new; \
        mv debian/gosa/usr/share/gosa/include/functions.inc.new debian/gosa/usr/share/gosa/include/functions.inc;

diff --git a/gen_locale.sh b/gen_locale.sh
deleted file mode 100755 (executable)
index 4d69d15..0000000
--- a/gen_locale.sh
+++ /dev/null
@@ -1,172 +0,0 @@
-#!/bin/sh
-
-generate_po() {
-  ORIG=`pwd`
-  TEMPDIR="/tmp/gosa-locale"
-  TRUE=`which true`
-
-  echo
-  echo "Creating temporary directory..."
-  [ -d $TEMPDIR ] && rm -rf $TEMPDIR
-  mkdir $TEMPDIR
-
-  echo "Creating copy of GOsa..."
-  tar c . | tar x -C $TEMPDIR
-
-  echo "Converting .tpl files..."
-  pushd . &> /dev/null
-  cd $TEMPDIR
-
-  for template in $(find . -name '*.tpl'); do
-    echo "* converting .tpl files: $(basename $template)"
-    sed -e 's/{t}/<?php $t= _("/g;s!{/t}!");?>!g' $template > $template.new
-    mv $template.new $template
-  done
-
-  for class in $(find . -name 'class_*.inc'); do
-    echo "* converting class_*.inc files: $(basename $class)"
-    sed -e 's/\($pl[DH][^=]*\)= *"\([^"]*\)";$/\1= _("\2");/g' $class > $class.new
-    mv $class.new $class
-  done
-
-  echo "* converting strings from gosa.conf"
-  sed -e 's/headline="\([^"]*\)"/<?php $headline=_("\1");?>/g;s/name="\([^"]*\)"/<?php $t= _("\1");?>/g' contrib/gosa.conf > contrib/gosa.conf.new
-  mv contrib/gosa.conf.new contrib/gosa.conf
-
-  echo "Extracting languages..."
-  rm locale/messages.po
-  (echo contrib/gosa.conf; find . -name '*.[ctpi][ophn][nlpc]') | xgettext -f - --keyword=must -d Domain -L PHP -n -o locale/messages.po
-
-  echo "Merging po files with existing ones"
-  error=0
-  for f in locale/??/LC_MESSAGES; do
-    echo -n "* merging $f/messages.po: "
-    [ -f $f/messages.po ] && msgmerge $f/messages.po locale/messages.po --output-file=$f/messages.po.new &> /dev/null
-
-    # Do an extra check for dummy dir 'locale/en/LC_MESSAGES'
-    if [ $? -ne 0 ]; then
-      [ "$f" == "locale/en/LC_MESSAGES" ] && $TRUE
-    fi
-
-    if [ $? -eq 0 ]; then
-      echo "done";
-    else
-      echo "failed";
-      error=1
-    fi
-
-  done
-
-  echo "Copying new po files, making backups..."
-  find . -name messages.po | while read f; do
-
-    if [ -f $ORIG/$f ]; then
-      mv $ORIG/$f $ORIG/$f.orig
-    else
-      continue
-    fi
-
-    echo $f | grep -q "locale/messages.po"
-    if [ $? -ne 0 ]; then
-      echo "* replaced $ORIG/$f"
-      cp $f.new $ORIG/$f
-    else
-      cp $f $ORIG/$f
-    fi
-
-  done
-
-  rm -rf $TEMPDIR
-
-  echo
-  if [ $error -eq 0 ]; then
-    if [ $ASSUME_Y -eq 1 ]; then
-      find $ORIG/ -type f -name 'messages.po.orig' -exec rm -f {} \;
-    else
-      read -p "Do you want to erase the message.po.orig files? (y/n)" -n1 ans
-
-      if [ "$ans" == "y" -o "$ans" == "Y" ]; then
-        find $ORIG/ -type f -name 'messages.po.orig' -exec rm -f {} \;
-      fi
-    fi
-
-  else
-    echo "There were errors during the transition. Please fix!"
-    exit 1
-  fi
-
-cat <<-EOF
-
----------------------------------------------------------------------
-
-Now edit all files that have been replaced above (i.e. using kbabel
-or gtranslator) and mail the changes to gosa@oss.gonicus.de to be 
-included in the next release.
-
-To see the changes you've made in GOsa, run "msgfmt messages.po" on
-your freshly edited files and restart your apache after that. Set
-the webbrowser to the language you've edited and go back to the
-login screen.
-
----------------------------------------------------------------------
-
-EOF
-
-  popd &> /dev/null
-}
-
-compile_po()
-{
-  po='messages.po'
-  mo='messages.mo'
-
-  echo "Compiling po files..."
-  for f in locale/??/LC_MESSAGES; do
-
-    if [ -f $f/$po ]; then
-      echo "* compiling $f/$po"
-      msgfmt $f/$po -o $f/$mo
-    else
-      echo "! skipped   $f/$po - does not exist"
-      error=1
-      continue
-    fi
-
-  done
-}
-
-#
-# MAIN
-#
-GENERATE=0
-COMPILE=0
-ASSUME_Y=0
-while getopts ":cgyh" opt
-do
-  case $opt in
-    c) COMPILE=1
-       ;;
-    g) GENERATE=1;
-       ;;
-    y) ASSUME_Y=1;
-       ;;
-    h|--help)
-       echo "Usage: $(basename $0) [-c] [-g] [-y]"
-       echo "       -c compile existing po files into mo files"
-       echo "       -g extract strings from GOsa and generate po files"
-       echo "       -y assume yes"
-       exit 1
-       ;;
-  esac
-done
-shift $(($OPTIND - 1))
-
-# Default to generate
-if [ $GENERATE -eq 0 -a $COMPILE -eq 0 ]; then
-  GENERATE=1
-fi
-
-[ $GENERATE -eq 1 ] && generate_po
-[ $COMPILE -eq 1 ]  && compile_po
-
-# vim:tabstop=2:expandtab:shiftwidth=2:syntax:ruler:

diff --git a/gen_online_help.sh b/gen_online_help.sh
deleted file mode 100755 (executable)
index 73062f1..0000000
--- a/gen_online_help.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-# Defaults for Debian
-CNV=`pwd`/contrib/latex2html
-LYX=lyx-qt
-
-# Sanity checks
-if [ ! -d doc/guide/user ]; then
-       echo "Can't find usable documentation structure - aborting"
-       exit 1
-fi
-
-# Commands present?
-for cmd in $CNV $LYX; do
-       if ! which $cmd &> /dev/null; then
-               echo "Can't find executable for '$cmd' - aborting"
-               exit 2
-       fi
-done
-
-pushd . &> /dev/null
-cd doc/guide/user
-
-for lang in *; do
-       [ ! -d "$lang" ] && continue
-
-       pushd . &> /dev/null
-       echo "Processing language $lang..."
-       cd $lang/lyx-source
-
-       for source in *.lyx; do
-               $LYX -e latex $source; d=../html/${source%%\.*}/ > /dev/null
-               [ -d $d ] || mkdir -p $d && rm -r $d/* &> /dev/null
-               $CNV -no_navigation -dir $d ${source%%\.*}.tex > /dev/null
-       done
-
-       popd &> /dev/null
-done
-
-popd &> /dev/null
-echo
-exit 0

diff --git a/gen_pdf_help.sh b/gen_pdf_help.sh
deleted file mode 100755 (executable)
index bd6bd65..0000000
--- a/gen_pdf_help.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-# Defaults for Debian
-LYX=lyx-qt
-
-# Sanity checks
-if [ ! -d doc/guide/user ]; then
-       echo "Can't find usable documentation structure - aborting"
-       exit 1
-fi
-
-# Commands present?
-for cmd in $LYX; do
-       if ! which $cmd &> /dev/null; then
-               echo "Can't find executable for '$cmd' - aborting"
-               exit 2
-       fi
-done
-
-pushd . &> /dev/null
-cd doc/guide/user
-
-for lang in *; do
-       [ ! -d "$lang" ] && continue
-
-       pushd . &> /dev/null
-       echo "Processing language $lang..."
-       cd $lang/lyx-source
-
-       for source in *.lyx; do
-               $LYX -e pdf $source; d=../pdf/${source%%\.*}/; pdf=${source%lyx}pdf > /dev/null
-               [ -d $d ] || mkdir -p $d && cp $pdf ../pdf/${source%%\.*}/ >/dev/null
-       done
-
-       popd &> /dev/null
-done
-
-popd &> /dev/null
-echo
-exit 0

diff --git a/update-locale b/update-locale
new file mode 100755 (executable)
index 0000000..4d69d15
--- /dev/null
+++ b/update-locale
@@ -0,0 +1,172 @@
+#!/bin/sh
+
+generate_po() {
+  ORIG=`pwd`
+  TEMPDIR="/tmp/gosa-locale"
+  TRUE=`which true`
+
+  echo
+  echo "Creating temporary directory..."
+  [ -d $TEMPDIR ] && rm -rf $TEMPDIR
+  mkdir $TEMPDIR
+
+  echo "Creating copy of GOsa..."
+  tar c . | tar x -C $TEMPDIR
+
+  echo "Converting .tpl files..."
+  pushd . &> /dev/null
+  cd $TEMPDIR
+
+  for template in $(find . -name '*.tpl'); do
+    echo "* converting .tpl files: $(basename $template)"
+    sed -e 's/{t}/<?php $t= _("/g;s!{/t}!");?>!g' $template > $template.new
+    mv $template.new $template
+  done
+
+  for class in $(find . -name 'class_*.inc'); do
+    echo "* converting class_*.inc files: $(basename $class)"
+    sed -e 's/\($pl[DH][^=]*\)= *"\([^"]*\)";$/\1= _("\2");/g' $class > $class.new
+    mv $class.new $class
+  done
+
+  echo "* converting strings from gosa.conf"
+  sed -e 's/headline="\([^"]*\)"/<?php $headline=_("\1");?>/g;s/name="\([^"]*\)"/<?php $t= _("\1");?>/g' contrib/gosa.conf > contrib/gosa.conf.new
+  mv contrib/gosa.conf.new contrib/gosa.conf
+
+  echo "Extracting languages..."
+  rm locale/messages.po
+  (echo contrib/gosa.conf; find . -name '*.[ctpi][ophn][nlpc]') | xgettext -f - --keyword=must -d Domain -L PHP -n -o locale/messages.po
+
+  echo "Merging po files with existing ones"
+  error=0
+  for f in locale/??/LC_MESSAGES; do
+    echo -n "* merging $f/messages.po: "
+    [ -f $f/messages.po ] && msgmerge $f/messages.po locale/messages.po --output-file=$f/messages.po.new &> /dev/null
+
+    # Do an extra check for dummy dir 'locale/en/LC_MESSAGES'
+    if [ $? -ne 0 ]; then
+      [ "$f" == "locale/en/LC_MESSAGES" ] && $TRUE
+    fi
+
+    if [ $? -eq 0 ]; then
+      echo "done";
+    else
+      echo "failed";
+      error=1
+    fi
+
+  done
+
+  echo "Copying new po files, making backups..."
+  find . -name messages.po | while read f; do
+
+    if [ -f $ORIG/$f ]; then
+      mv $ORIG/$f $ORIG/$f.orig
+    else
+      continue
+    fi
+
+    echo $f | grep -q "locale/messages.po"
+    if [ $? -ne 0 ]; then
+      echo "* replaced $ORIG/$f"
+      cp $f.new $ORIG/$f
+    else
+      cp $f $ORIG/$f
+    fi
+
+  done
+
+  rm -rf $TEMPDIR
+
+  echo
+  if [ $error -eq 0 ]; then
+    if [ $ASSUME_Y -eq 1 ]; then
+      find $ORIG/ -type f -name 'messages.po.orig' -exec rm -f {} \;
+    else
+      read -p "Do you want to erase the message.po.orig files? (y/n)" -n1 ans
+
+      if [ "$ans" == "y" -o "$ans" == "Y" ]; then
+        find $ORIG/ -type f -name 'messages.po.orig' -exec rm -f {} \;
+      fi
+    fi
+
+  else
+    echo "There were errors during the transition. Please fix!"
+    exit 1
+  fi
+
+cat <<-EOF
+
+---------------------------------------------------------------------
+
+Now edit all files that have been replaced above (i.e. using kbabel
+or gtranslator) and mail the changes to gosa@oss.gonicus.de to be 
+included in the next release.
+
+To see the changes you've made in GOsa, run "msgfmt messages.po" on
+your freshly edited files and restart your apache after that. Set
+the webbrowser to the language you've edited and go back to the
+login screen.
+
+---------------------------------------------------------------------
+
+EOF
+
+  popd &> /dev/null
+}
+
+compile_po()
+{
+  po='messages.po'
+  mo='messages.mo'
+
+  echo "Compiling po files..."
+  for f in locale/??/LC_MESSAGES; do
+
+    if [ -f $f/$po ]; then
+      echo "* compiling $f/$po"
+      msgfmt $f/$po -o $f/$mo
+    else
+      echo "! skipped   $f/$po - does not exist"
+      error=1
+      continue
+    fi
+
+  done
+}
+
+#
+# MAIN
+#
+GENERATE=0
+COMPILE=0
+ASSUME_Y=0
+while getopts ":cgyh" opt
+do
+  case $opt in
+    c) COMPILE=1
+       ;;
+    g) GENERATE=1;
+       ;;
+    y) ASSUME_Y=1;
+       ;;
+    h|--help)
+       echo "Usage: $(basename $0) [-c] [-g] [-y]"
+       echo "       -c compile existing po files into mo files"
+       echo "       -g extract strings from GOsa and generate po files"
+       echo "       -y assume yes"
+       exit 1
+       ;;
+  esac
+done
+shift $(($OPTIND - 1))
+
+# Default to generate
+if [ $GENERATE -eq 0 -a $COMPILE -eq 0 ]; then
+  GENERATE=1
+fi
+
+[ $GENERATE -eq 1 ] && generate_po
+[ $COMPILE -eq 1 ]  && compile_po
+
+# vim:tabstop=2:expandtab:shiftwidth=2:syntax:ruler:

diff --git a/update-online-help b/update-online-help
new file mode 100755 (executable)
index 0000000..73062f1
--- /dev/null
+++ b/update-online-help
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+# Defaults for Debian
+CNV=`pwd`/contrib/latex2html
+LYX=lyx-qt
+
+# Sanity checks
+if [ ! -d doc/guide/user ]; then
+       echo "Can't find usable documentation structure - aborting"
+       exit 1
+fi
+
+# Commands present?
+for cmd in $CNV $LYX; do
+       if ! which $cmd &> /dev/null; then
+               echo "Can't find executable for '$cmd' - aborting"
+               exit 2
+       fi
+done
+
+pushd . &> /dev/null
+cd doc/guide/user
+
+for lang in *; do
+       [ ! -d "$lang" ] && continue
+
+       pushd . &> /dev/null
+       echo "Processing language $lang..."
+       cd $lang/lyx-source
+
+       for source in *.lyx; do
+               $LYX -e latex $source; d=../html/${source%%\.*}/ > /dev/null
+               [ -d $d ] || mkdir -p $d && rm -r $d/* &> /dev/null
+               $CNV -no_navigation -dir $d ${source%%\.*}.tex > /dev/null
+       done
+
+       popd &> /dev/null
+done
+
+popd &> /dev/null
+echo
+exit 0

diff --git a/update-pdf-help b/update-pdf-help
new file mode 100755 (executable)
index 0000000..bd6bd65
--- /dev/null
+++ b/update-pdf-help
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+# Defaults for Debian
+LYX=lyx-qt
+
+# Sanity checks
+if [ ! -d doc/guide/user ]; then
+       echo "Can't find usable documentation structure - aborting"
+       exit 1
+fi
+
+# Commands present?
+for cmd in $LYX; do
+       if ! which $cmd &> /dev/null; then
+               echo "Can't find executable for '$cmd' - aborting"
+               exit 2
+       fi
+done
+
+pushd . &> /dev/null
+cd doc/guide/user
+
+for lang in *; do
+       [ ! -d "$lang" ] && continue
+
+       pushd . &> /dev/null
+       echo "Processing language $lang..."
+       cd $lang/lyx-source
+
+       for source in *.lyx; do
+               $LYX -e pdf $source; d=../pdf/${source%%\.*}/; pdf=${source%lyx}pdf > /dev/null
+               [ -d $d ] || mkdir -p $d && cp $pdf ../pdf/${source%%\.*}/ >/dev/null
+       done
+
+       popd &> /dev/null
+done
+
+popd &> /dev/null
+echo
+exit 0