summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichi Henning <michi.henning@canonical.com>2014-11-24 12:37:01 +1000
committerMichi Henning <michi.henning@canonical.com>2014-11-24 12:37:01 +1000
commitce7c2100749af1b94c151b4d002ed3317b84dc2f (patch)
treefd81aead232d24bf2f74b79feac51511b961e8d2
parent53b7a6038b8dca0075679db78839ae59b0e85a68 (diff)
downloadintltool-ce7c2100749af1b94c151b4d002ed3317b84dc2f.tar.gz
Fixed incorrect handling of spaces around = in .ini files.
-rw-r--r--intltool-extract.in2
-rw-r--r--intltool-merge.in4
2 files changed, 3 insertions, 3 deletions
diff --git a/intltool-extract.in b/intltool-extract.in
index 45a969c..47a539b 100644
--- a/intltool-extract.in
+++ b/intltool-extract.in
@@ -276,7 +276,7 @@ sub add_message
sub type_ini {
### For generic translatable desktop files ###
- while ($input =~ /^(#(.+)\n)?^_.*=(.*)$/mg) {
+ while ($input =~ /^(#(.+)\n)?^_[A-Za-z0-9\-]+\s*=\s*(.*)$/mg) {
if (defined($2)) {
$comments{$3} = $2;
}
diff --git a/intltool-merge.in b/intltool-merge.in
index 1afa2a4..05db7cf 100644
--- a/intltool-merge.in
+++ b/intltool-merge.in
@@ -1186,7 +1186,7 @@ sub desktop_merge_translations
while (<INPUT>)
{
- if (s/^(\s*)_([A-Za-z0-9\-]+=(.*))/$1$2/)
+ if (s/^(\s*)_([A-Za-z0-9\-]+\s*=\s*(.*))/$1$2/)
{
my $string = $3;
@@ -1200,7 +1200,7 @@ sub desktop_merge_translations
next if !$translation;
$_ = $non_translated_line;
- s/(\w+)=.*/${1}[$lang]=$translation/;
+ s/(\w+)\s*=\s*.*/${1}[$lang]=$translation/;
print OUTPUT;
}
}