SF.net SVN: postfixadmin: [229] trunk/languages/language-update.sh

[<chr...@us...>]

Revision: 229
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=229&view=rev
Author:   christian_boltz
Date:     2007-11-15 12:44:15 -0800 (Thu, 15 Nov 2007)

Log Message:
-----------
- added --rename to rename a $PALANG string
- put most code into functions
- lots of whitespace changes and code reordering - this makes the diff 
  nearly useless, sorry

Modified Paths:
--------------
    trunk/languages/language-update.sh

Modified: trunk/languages/language-update.sh
===================================================================
--- trunk/languages/language-update.sh	2007-11-15 18:16:17 UTC (rev 228)
+++ trunk/languages/language-update.sh	2007-11-15 20:44:15 UTC (rev 229)
@@ -14,38 +14,153 @@
  #
  # File: language-update.sh
  # Lists missing translations in language files and optionally patches the
- # english texts into the language file
+ # english texts into the language file.
+ # Can also rename a $PALANG string.
  #
  # written by Christian Boltz
 
 
-notext=0 # output full lines by default
-patch=0  # do not patch by default
-nocleanup=0 # don't delete tempfiles
-filelist="en.lang" # always needed for comparison
+function update_string_list() {
+	for file in en.lang $filelist ; do
+		echo "<?php include('$file'); print join(\"\\n\", array_keys(\$PALANG)) . \"\\n\"; ?>" | php > $file.strings
+	done
 
-while [ -n "$1" ] ; do
-	case "$1" in
-		--help)
-			echo '
-Lists missing translations in language files and optionally patches the
-english texts into the language file
+	for file in $filelist ; do
+		test "$file" = "en.lang" && continue
+		LANG=C diff -U2 $file.strings en.lang.strings > $file.diff && echo "*** $file: no difference ***"
 
+		test $notext = 1 && cat $file.diff && continue
+
+		grep -v 'No newline at end of file' "$file.diff" | while read line ; do
+			greptext="$(echo $line | sed 's/^[+ 	-]//')"
+			grepresult=$(grep "'$greptext'" en.lang) || grepresult="***DEFAULT*** $line"
+			grepresult2=$(grep "'$greptext'" $file)  || grepresult2="$grepresult"
+			case "$line" in
+				---*)
+					echo "$line"
+					;;
+				+++*)
+					echo "$line"
+					;;
+				@*)
+					echo "$line"
+					;;
+				-*)
+					echo "-$grepresult"
+					;;
+				+*)
+					# needs translation
+					# already added as comment?
+					test "$grepresult" = "$grepresult2" && {
+						echo "+$grepresult # XXX" # english
+					} || {
+						echo " $grepresult2" # translated
+						echo "keeping line $grepresult2" >&2
+						echo "This will result in a malformed patch." >&2
+					}
+					;;
+				*)
+					echo " $grepresult2"
+					;;
+			esac
+		done > $file.patch
+
+		test $patch = 0 && cat $file.patch
+		test $patch = 1 && patch --fuzz=1 $file < $file.patch
+	done
+} # end update_string_list()
+
+
+function rename_string() {
+	for file in $filelist ; do
+		line="$(grep "PALANG\['$rename_old'\]" "$file")" || {
+			echo "*** $file does not contain \$PALANG['$rename_old'] ***" >&2
+			continue
+		}
+
+		newline="$(echo "$line" | sed "s/'$rename_old'/'$rename_new'/")"
+
+		# create patch
+		echo "
+--- $file.old
++++ $file
+@@ -1,1 +1,1 @@
+-$line
++$newline
+		" > "$file.patch"
+
+		test $patch = 0 && cat $file.patch
+		test $patch = 1 && patch $file < $file.patch
+	done
+} # end rename_string()
+
+
+function cleanup() {
+	# check for duplicated strings
+	for file in $filelist ; do
+		sed -n "/PALANG/ s/[  ]*\$PALANG\['// ; s/'.*//p" $file |sort |uniq -c |grep -v " *1 " >&2 && \
+		echo "*** duplicated string in $file, see above for details ***" >&2
+	done
+
+	# cleanup tempfiles
+	test $nocleanup = 0 && for file in $filelist ; do
+		rm -f $file.patch $file.strings $file.diff
+	done
+} # end cleanup()
+
+
+usage() {
+	echo '
     Usage:
+    ~~~~~~
 
-    '"$0"' [--notext | --patch] [--nocleanup] [foo.lang [bar.lang [...] ] ]
 
-    --notext will only list the translation keys (useful for a quick overview)
-    --patch will patch the language file directly
-    --nocleanup will keep all temp files (for debugging only)
+'"$0"' [--notext | --patch] [--nocleanup] [foo.lang [bar.lang [...] ] ]
 
-    You can give any number of langugage files as parameter.
-    If no files are given, all *.lang files will be used.
+    List missing translations in language files and optionally patch the
+    english texts into the language file
 
+    --notext 
+        only list the translation keys (useful for a quick overview)
+
     Note for translators: untranslated entries have a comment
         # XXX
     attached.
+
+
+'"$0"' --rename old_string new_string [--patch] [--nocleanup] [foo.lang [bar.lang [...] ] ]
+
+    Rename $PALANG['"'"'old_string'"'"'] to $PALANG['"'"'new_string'"'"']
+
+
+Common parameters:
+
+    --patch
+        patch the language file directly (instead of displaying the patch)
+    --nocleanup 
+        keep all temp files (for debugging)
+
+    You can give any number of langugage files as parameter.
+    If no files are given, all *.lang files will be used.
+
 '
+} # end usage()
+
+
+# main script
+
+notext=0 # output full lines by default
+patch=0  # do not patch by default
+nocleanup=0 # don't delete tempfiles
+rename=0 # rename a string
+rename_old=''
+renane_new=''
+filelist=''
+
+while [ -n "$1" ] ; do
+	case "$1" in
+		--help)
+			usage
 			exit 0;
 			;;
 		--notext)
@@ -57,6 +172,14 @@
 		--nocleanup)
 			nocleanup=1
 			;;
+		--rename)
+			rename=1
+			shift ; rename_old="$1"
+			shift ; rename_new="$1"
+			echo "$rename_old" | grep '^[a-z_-]*\.lang$' && rename_new='' # error out on *.lang - probably a filename
+			echo "$rename_new" | grep '^[a-z_-]*\.lang$' && rename_new='' # error out on *.lang - probably a filename
+			test -z "$rename_new" && { echo '--rename needs two parameters' >&2 ; exit 1 ; }
+			;;
 		-*)
 			echo 'unknown option. Try --help ;-)' >&2
 			exit 1
@@ -66,68 +189,13 @@
 			;;
 	esac
 	shift
-done
+done # end $@ loop
 
 test $notext = 1 && test $patch = 1 && echo "ERROR: You can't use --notext AND --patch at the same time." >&2 && exit 2
+test $notext = 1 && test $rename = 1 && echo "ERROR: You can't use --notext AND --rename at the same time." >&2 && exit 2
 
-test "$filelist" = "en.lang" && filelist="`ls -1 *.lang`"
+test "$filelist" = "" && filelist="`ls -1 *.lang`"
 
-for file in $filelist ; do
-	echo "<?php include('$file'); print join(\"\\n\", array_keys(\$PALANG)) . \"\\n\"; ?>" | php > $file.strings
-done
+test "$rename" = 1 && { rename_string ; cleanup ; exit 0 ; }
 
-
-for file in $filelist ; do
-	test "$file" = "en.lang" && continue
-	LANG=C diff -U2 $file.strings en.lang.strings > $file.diff && echo "*** $file: no difference ***"
-
-	test $notext = 1 && cat $file.diff && continue
-
-	grep -v 'No newline at end of file' "$file.diff" | while read line ; do
-		greptext="$(echo $line | sed 's/^[+ 	-]//')"
-		grepresult=$(grep "'$greptext'" en.lang) || grepresult="***DEFAULT*** $line"
-		grepresult2=$(grep "'$greptext'" $file)  || grepresult2="$grepresult"
-		case "$line" in
-			---*)
-				echo "$line"
-				;;
-			+++*)
-				echo "$line"
-				;;
-			@*)
-				echo "$line"
-				;;
-			-*)
-				echo "-$grepresult"
-				;;
-			+*)
-				# needs translation
-				# already added as comment?
-				test "$grepresult" = "$grepresult2" && {
-					echo "+$grepresult # XXX" # english
-				} || {
-					echo " $grepresult2" # translated
-					echo "keeping line $grepresult2" >&2
-					echo "This will result in a malformed patch." >&2
-				}
-				;;
-			*)
-				echo " $grepresult2"
-				;;
-		esac
-	done > $file.patch
-
-	test $patch = 0 && cat $file.patch
-	test $patch = 1 && patch --fuzz=1 $file < $file.patch
-done
-###############################################################################
-
-# check for duplicated strings
-for file in $filelist ; do
-	sed -n "/PALANG/ s/[  ]*\$PALANG\['// ; s/'.*//p" $file |sort |uniq -c |grep -v " *1 " >&2 && \
-	echo "*** duplicated string in $file, see above for details ***" >&2
-done
-
-test $nocleanup = 0 && for file in $filelist ; do
-	rm -f $file.patch $file.strings $file.diff
-done
+update_string_list ; cleanup # default operation


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.