From: Daniel Kolesa <d.kolesa@samsung.com>
Date: Tue, 3 Jun 2014 15:05:50 +0000 (+0100)
Subject: elua: xgettext's semantics are WTF, but okay, emulate it
X-Git-Tag: upstream/1.10.0+1149+ga3a15b1~644^2~32
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e32a1d7e785b3bb291e48c90ba0db6d2814b1b03;p=platform%2Fupstream%2Fefl.git

elua: xgettext's semantics are WTF, but okay, emulate it
---

diff --git a/src/bin/elua/modules/xgettext/generator.lua b/src/bin/elua/modules/xgettext/generator.lua
index 44a5321..632bd67 100644
--- a/src/bin/elua/modules/xgettext/generator.lua
+++ b/src/bin/elua/modules/xgettext/generator.lua
@@ -34,8 +34,7 @@ local gen_msgstr = function(str, prefix, suffix)
 end
 
 local cmp_msgs = function(msg1, msg2)
-    return msg1[1]      == msg2[1] and msg1[2] == msg2[2]
-       and msg1.context == msg2.context
+    return msg1[1] == msg2[1] and msg1.context == msg2.context
 end
 
 local new_msg = function(msg)
@@ -55,6 +54,9 @@ local gen_grouped_messages = function(ps)
         local found = false
         for i, amsg in ipairs(ret) do
             if cmp_msgs(msg, amsg) then
+                if not amsg[2] then
+                    amsg[2] = msg[2]
+                end
                 amsg.lines   [#amsg.lines    + 1] = msg.line
                 amsg.comments[#amsg.comments + 1] = msg.comment
                 for i, v in ipairs(msg.flags) do