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

List:       kde-commits
Subject:    KDE/kdesdk/lokalize/scripts
From:       Nickolai Shaforostoff <shafff () ukr ! net>
Date:       2009-06-16 22:07:17
Message-ID: 1245190037.641637.18657.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 982860 by shaforo:

fix nonlatin xlf filenames, add workaround for opensuse's pyuno




 M  +7 -1      xliff2odf-standalone.py  
 M  +1 -1      xliff2odf.py  
 M  +1 -0      xliffmerge.py  


--- trunk/KDE/kdesdk/lokalize/scripts/xliff2odf-standalone.py #982859:982860
@@ -1,7 +1,13 @@
 # -*- coding: utf-8 -*-
 import sys,os,re
 if os.name=='nt': import socket  # only needed on win32-OOo3.0.0
-import uno
+
+try: import uno
+except:
+    #opensuse needs this, while debian rocks w/o this
+    sys.path.append('/usr/lib/ooo3/basis-link/program/')
+    import uno
+
 import time
 
 def show_in_ooo(odfpathname,entryid):
--- trunk/KDE/kdesdk/lokalize/scripts/xliff2odf.py #982859:982860
@@ -20,7 +20,7 @@
 def convert():
     if not Editor.isValid() or Editor.currentFile()=='': return
 
-    xliffpathname=unicode(Editor.currentFile())
+    xliffpathname=Editor.currentFile()
     (path, filename)=os.path.split(xliffpathname)
     if not filename.endswith('.xlf'): return
 
--- trunk/KDE/kdesdk/lokalize/scripts/xliffmerge.py #982859:982860
@@ -4,6 +4,7 @@
 #python scripts/xliffmerge.py -i tests/testxliffmerge_tr.xlf -t \
tests/testxliffmerge_en.xlf -o test_merged.xlf  
 #TODO: mark as 'needs adaptation' when only punctuation is changed
+#check id's change after document update
 
 from PyQt4.QtCore import *
 from PyQt4.QtXml import *


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