[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    l10n-support/pology
From:       Chusslove Illich <caslav.ilic () gmx ! net>
Date:       2008-09-30 21:24:04
Message-ID: 1222809844.763311.6500.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 866445 by ilic:

Fix function clashes after mergin substring removal modules.

 M  +22 -21    hook/remove_subs.py  
 M  +2 -1      misc/resolve.py  


--- trunk/l10n-support/pology/hook/remove_subs.py #866444:866445
@@ -7,20 +7,20 @@
 @license: GPLv3
 """
 
-from pology.misc.resolve import remove_accelerator as _rem_in_text
+from pology.misc.resolve import remove_accelerator as _rm_accel_in_text
 import pology.misc.markup as M
 
 
-def _rem_in_msg (msg, accels, greedy=False):
+def _rm_accel_in_msg (msg, accels, greedy=False):
 
-    msg.msgid = _rem_in_text(msg.msgid, accels, greedy)
-    msg.msgid_plural = _rem_in_text(msg.msgid_plural, accels, greedy)
+    msg.msgid = _rm_accel_in_text(msg.msgid, accels, greedy)
+    msg.msgid_plural = _rm_accel_in_text(msg.msgid_plural, accels, greedy)
     for i in range(len(msg.msgstr)):
-        msg.msgstr[i] = _rem_in_text(msg.msgstr[i], accels, greedy)
+        msg.msgstr[i] = _rm_accel_in_text(msg.msgstr[i], accels, greedy)
 
-    msg.msgid_previous = _rem_in_text(msg.msgid_previous, accels, greedy)
-    msg.msgid_plural_previous = _rem_in_text(msg.msgid_plural_previous, accels,
-                                             greedy)
+    msg.msgid_previous = _rm_accel_in_text(msg.msgid_previous, accels, greedy)
+    msg.msgid_plural_previous = _rm_accel_in_text(msg.msgid_plural_previous,
+                                                  accels, greedy)
 
 
 def remove_accel_text (cat, msg, text):
@@ -39,7 +39,7 @@
     """
 
     accels = cat.accelerator()
-    return _rem_in_text(text, accels)
+    return _rm_accel_in_text(text, accels)
 
 
 def remove_accel_text_greedy (cat, msg, text):
@@ -52,7 +52,7 @@
     """
 
     accels = cat.accelerator()
-    return _rem_in_text(text, accels, greedy=True)
+    return _rm_accel_in_text(text, accels, greedy=True)
 
 
 def remove_accel_msg (cat, msg):
@@ -65,7 +65,7 @@
     """
 
     accels = cat.accelerator()
-    _rem_in_msg(msg, accels)
+    _rm_accel_in_msg(msg, accels)
 
 
 def remove_accel_msg_greedy (cat, msg):
@@ -78,10 +78,10 @@
     """
 
     accels = cat.accelerator()
-    _rem_in_msg(msg, accels, greedy=True)
+    _rm_accel_in_msg(msg, accels, greedy=True)
 
 
-def _rem_in_text (text, mtypes):
+def _rm_markup_in_text (text, mtypes):
 
     for mtype in mtypes:
         mtype = mtype.lower()
@@ -101,15 +101,16 @@
     return text
 
 
-def _rem_in_msg (msg, mtypes):
+def _rm_markup_in_msg (msg, mtypes):
 
-    msg.msgid = _rem_in_text(msg.msgid, mtypes)
-    msg.msgid_plural = _rem_in_text(msg.msgid_plural, mtypes)
+    msg.msgid = _rm_markup_in_text(msg.msgid, mtypes)
+    msg.msgid_plural = _rm_markup_in_text(msg.msgid_plural, mtypes)
     for i in range(len(msg.msgstr)):
-        msg.msgstr[i] = _rem_in_text(msg.msgstr[i], mtypes)
+        msg.msgstr[i] = _rm_markup_in_text(msg.msgstr[i], mtypes)
 
-    msg.msgid_previous = _rem_in_text(msg.msgid_previous, mtypes)
-    msg.msgid_plural_previous = _rem_in_text(msg.msgid_plural_previous, mtypes)
+    msg.msgid_previous = _rm_markup_in_text(msg.msgid_previous, mtypes)
+    msg.msgid_plural_previous = _rm_markup_in_text(msg.msgid_plural_previous,
+                                                   mtypes)
 
 
 def remove_markup_text (cat, msg, text):
@@ -130,7 +131,7 @@
     """
 
     mtypes = cat.markup()
-    return _rem_in_text(text, mtypes)
+    return _rm_markup_in_text(text, mtypes)
 
 
 def remove_markup_msg (cat, msg):
@@ -142,5 +143,5 @@
     """
 
     mtypes = cat.markup()
-    _rem_in_msg(msg, mtypes)
+    _rm_markup_in_msg(msg, mtypes)
 
--- trunk/l10n-support/pology/misc/resolve.py #866444:866445
@@ -650,8 +650,9 @@
             if text[p + alen:p + 2 * alen] == accel:
                 # Escaped accelerator marker.
                 text = text[:p] + text[p + alen:]
-                p += alen
 
+            p += alen
+
     return text
 
 
[prev in list] [next in list] [prev in thread] [next in thread]