Changeset 2428

Timestamp:

12/31/07 16:28:52 (1 year ago)

Author:

taj

Message:

* makepackage: Fix translations with @ (encoding) marking in metadata. If the translation with the @ is the only translation for that language, the @ and encoding are stripped
(sr@Latn -> sr). If there is already a translation with no encoding marking, the one with the mark is dropped. Fixes #55.

Files:

• main/trunk/ChangeLog (modified) (2 diffs)
• main/trunk/makepackage (modified) (4 diffs)

main/trunk/ChangeLog

@@ +1 @@
+Mon Dec 31 21:24:12 UTC 2007  Taj Morton  <tajmorton@gmail.com>
+        * makepackage: Fix translations with @ (encoding) marking in metadata. If
+          the translation with the @ is the only translation for that language, the
+          @ and encoding are stripped (sr@Latn -> sr). If there is already a
+          translation with no encoding marking, the one with the mark is dropped.
+          Fixes #55.
+
-Sat Dec 29 21:33:12 UTC 2007  Taj Morton  <tajmorton@gmail.com>
-
-
-
-
+
+
+
+
+
-        * makepackage: Substitute %ErrorMessage% in installer.[?].template.
-
@@ -20 +28 @@
-
-2007-09-04  Isak Savo  <isak.savo@gmail.com>
-
-
+
+
+
+
+
+
-
-2007-09-04  Isak Savo  <isak.savo@gmail.com>

main/trunk/makepackage

@@ -555 +555 @@
-                # Summary: <data>               --->    SUMMARY="<data>"
-                # Summary[fr]: <data>           --->    SUMMARY_fr="<data>"
+                # Summary[fr@Latn]: <data>      ---->   SUMMARY_fr="<data>"
-                #
-                # allow ':' to be used in Meta data, need to focus on the first instance of ':'
-                # first instance can be determined on localized keys because of the ']: ' so substitute in '='
-                # and non-localized keys are converted to variables in subup function
+                meta_localized=`echo "$meta_localized" | sed 's/@.*\]/\]/g'`
-                meta_localized=`echo "$meta_localized" | sed 's/\]: /\=\"/g'`
-                meta_localized=`echo "$meta_localized" | sed 's/\(.\)$/\1"/g'`
@@ -1662 +1664 @@
-                meta_desktop_languages="en"
-                for line in $meta_names $meta_comments; do
-
+ | sed 's/@.*//g'
-                        meta_desktop_languages=`echo "$meta_desktop_languages"; echo "$meta_desktop_language_add"`
-                done
@@ -1671 +1673 @@
-                # check to see if DISPLAYNAME_en is available and if not use DISPLAYNAME instead and write DISPLAYNAME_en to $meta_names
-                meta_name_en=`echo "$meta_names" | grep '^DISPLAYNAME_en=' | awk 'BEGIN { FS="=" } { print $2 }'`
+                
+                encoding_lines=`echo "$meta_names" | grep '@.*='`
+                for line in $encoding_lines; do
+                        # find any translations that have @ (encoding) markings
+                        if echo "$meta_names" | grep -q `echo "$line" | sed 's/@.*=.*/=/g'`; then
+                                # drop if there's already a translation w/o encoding marking
+                                meta_names=`echo "$meta_names" | sed "s/$line//g"`
+                        else
+                                # there's no translation for this language, so use it
+                                # (we can't handle @s)
+                                old_encoding=`echo "$line" | sed 's/.*\(_.*@.*\)=.*/\1/g'`
+                                new_encoding=`echo "$old_encoding" | sed 's/@.*//g'`
+                                meta_names=`echo "$meta_names" | sed "s/$old_encoding/$new_encoding/g"`
+                                
+                        fi
+                done
+                
-                if [ "$meta_name_en" == "" ]; then
-                        meta_name_en=`echo "$meta_names" | grep '^DISPLAYNAME=' | awk 'BEGIN { FS="=" } { print $2 }'`
@@ -1682 +1701 @@
-                # check to see if SUMMARY_en is available and if not use SUMMARY instead and write SUMMARY_en to $meta_comments
-                meta_comment_en=`echo "$meta_comments" | grep '^SUMMARY_en=' | awk 'BEGIN { FS="=" } { print $2 }'`
+                
+                encoding_lines=`echo "$meta_comments" | grep '@.*='`
+                for line in $encoding_lines; do
+                        # find any translations that have @ (encoding) markings
+                        if echo "$meta_comments" | grep -q `echo "$line" | sed 's/@.*=.*/=/g'`; then
+                                # drop if there's already a translation w/o encoding marking
+                                meta_comments=`echo "$meta_comments" | sed "s/$line//g"`
+                        else
+                                # there's no translation for this language, so use it
+                                # (we can't handle @s)
+                                old_encoding=`echo "$line" | sed 's/.*\(_.*@.*\)=.*/\1/g'`
+                                new_encoding=`echo "$old_encoding" | sed 's/@.*//g'`
+                                meta_comments=`echo "$meta_comments" | sed "s/$old_encoding/$new_encoding/g"`
+                        fi
+                done
+                
-                if [ "$meta_comment_en" == "" ]; then
-                        meta_comment_en=`echo "$meta_comments" | grep '^SUMMARY=' | awk 'BEGIN { FS="=" } { print $2 }'`