Commit graph

446 commits

Author SHA1 Message Date
Ztamas
b0f07bbbc4 Write source file into po entries' msgctxt
So (msgctxt, msgid) pair is unique in one po file

Change-Id: I64635dd7a6352300ed5fb6949a1b78c2a070c660
2012-11-18 14:15:15 +01:00
Andras Timar
124dc60e55 Revert "put filename into msgctxt, because po entries must be unique"
This reverts commit 889574a50c.
2012-11-18 13:04:33 +01:00
Andras Timar
889574a50c put filename into msgctxt, because po entries must be unique
Change-Id: I700b668863c2b20cdf60fa672a994b8ae4dc613a
2012-11-18 12:48:24 +01:00
Ztamas
302a099e52 Write source file into po entries' msgctxt
So (msgctxt, msgid) pair is unique in one po file

Change-Id: I64635dd7a6352300ed5fb6949a1b78c2a070c660
2012-11-18 12:07:58 +01:00
Zolnai Tamás
fea5e609ba Last changes in renewpo for migration
Order PoEntries by their locations in original po files
by adding serialnumber in po2lo and work up them in this order
in renewpo. So the order will be the same in new po files.

Change-Id: Idb0547a2e1262008b374fe450ec3e01af0cff839
2012-11-17 14:31:17 +01:00
Zolnai Tamás
f6147cbe1c Handle dictionaries in the same way in localize
By now, not needed to handle dictionaries
in other way, because its root moves up directly
to core.

Change-Id: I90d6a67c90b00eea290f17e277fb13c0a6b0b5cd
2012-11-17 14:31:15 +01:00
Andras Timar
6cfa7552ee fix XML tag check in help and readme translations
Change-Id: I88a3ad382df41da96fcab38c3c06d5871228e082
2012-11-13 21:55:18 +01:00
Andras Timar
0a7189a3b2 remove obsoleted gsicheck tool
Change-Id: Ib25a6feae34533fa3752fe57e857613ca113ee3a
2012-11-13 11:44:29 +01:00
Andras Timar
deaceba0c2 XML tag check in help and readme translations
Change-Id: Iec88ae875e00777f499cd0044f256275d854dca8
2012-11-13 11:40:10 +01:00
Andras Timar
06ec1c0895 Merge branch 'master' into feature/killsdf
Conflicts:
	Repository.mk
	RepositoryFixes.mk
	connectivity/prj/build.lst
	extensions/prj/build.lst
	filter/prj/build.lst
	fpicker/prj/build.lst
	l10ntools/StaticLibrary_transex.mk
	saxon/build.xml
	shell/prj/build.lst
	solenv/gbuild/AllLangResTarget.mk
	solenv/gbuild/Configuration.mk
	solenv/gbuild/UI.mk
	ucb/source/ucp/webdav/webdavcontent.cxx
2012-11-11 18:24:14 +01:00
Zolnai Tamás
8e0d67bed5 Add some check to renewpo
Change-Id: I7b90785516f172f7b552a9e5ae30d02f7c52d7cf
2012-11-10 11:58:48 +01:00
Zolnai Tamás
643ffdf621 Add an extra empty line to lngmerge
It worked with eof before so an extra line
is needed.
See also this commit:
06175e8b19

Change-Id: Ic3f43a52801429258df620229269b8426f1e2995
2012-11-08 17:16:06 +01:00
Zolnai Tamás
ed879cdf29 Correct typo in po header
Change-Id: Ic98467f5c32a0a84af62f68fbe84c68c3e37f1c1
2012-11-08 12:13:03 +01:00
Zolnai Tamás
9e682e30e7 Localize.cxx add correct header to po
Belong to dictionaries modul

Change-Id: Ifd8303fd294de2369383cc2ce7ebdd1487c90463
2012-11-08 11:13:59 +01:00
Andras Timar
74abeff02b integrate librelogo to the build
Change-Id: I4cd29f6a893d72a49233bb53d19701d0bdd0e078
2012-11-07 23:32:35 +01:00
Zolnai Tamás
0853451b46 Correct propmerge
If there is no po entry for a string
than use the original en-US string

Change-Id: I4296ae9c189a3c65cf93a806edbf1317651d1486
2012-11-05 16:02:22 +01:00
Zolnai Tamás
0fd7f81ec6 Implement new treex executable
Which localize and update help tree files
instead of update_tree.pl.
Use it to update extensions' help.
Next step: use it with general help.

Change-Id: Ife9696bdd8b973ef3cf30626533e38720408179b
2012-11-03 23:40:30 +01:00
Andras Timar
c1b4077d1f escape quotes, unescape double escaped quotes fdo#56648
Change-Id: Id4135db2ec40865cddab533da15b2705dc7b73d5
2012-11-03 00:39:05 +01:00
Zolnai Tamás
0c7f8e6d0c Delete some unneeded checking from export2.cxx
Change-Id: Ib41c81629fbc5a8bd709391091c2777d49f9d9c4
2012-10-29 12:53:18 +01:00
Zolnai Tamás
8f57a9d2a1 Correct some naming in propex
Change-Id: Id5b17be8155f13529439dd9a46b42f6ffeed79b1
2012-10-29 12:50:09 +01:00
Zolnai Tamás
c6b26144c9 Use isFuzzy() instead of getFuzzy()
to make more obvious its aim

Change-Id: Idc98ae8ce2218c9d387c4f2cb6e4d5603b56aab3
2012-10-11 20:50:19 +02:00
Zolnai Tamás
471f2fc319 Use MsgCtxt, MsgId and MsgCtxt
which are fit better to concept of po.

Change-Id: I772e691465351b1492bdb756fc67e3a9de265c25
2012-10-11 20:40:55 +02:00
Zolnai Tamás
8a3ee4e765 Move GenPoEntry out of header
GenPoEntry is part of implementation rather than
an autonom class thus its place is in cxx file.
Because of pointer members we have to override
copy constructor and copy operator.
In PoHeader class these methods are unneeded
so make it non-copyable.
The m_bIsinitialized member's meaning widen with
that m_aGenPo points an object. So check it not just
in getter but in setter methods too.

Change-Id: I26ebb885c81d14820076e0d46625c60cc1cf7984
2012-10-10 19:06:06 +02:00
Zolnai Tamás
06175e8b19 Correct lngmerge not to work with eof
Change-Id: Ibf80a31ea2c03ff2882e71a45acb71d9c9a16482
2012-10-10 15:30:40 +02:00
Zolnai Tamás
a76c979c17 Delete WhiteSpace member of GenPoEntry
This member allows us to use more
kind of whitespace between po entries but
we use one end line everywhere so this variable
is unneeded.

Change-Id: I4e3c9040ca73580fd01484bb91325a9df04cb4e4
2012-10-10 15:17:20 +02:00
Zolnai Tamás
9ebb37f39b Relocate KeyId to PoEntry
KeyId is PoEntry specific attribute rather than
part of GenPoEntry. In GenPoEntry it is just
part of extracted comment.
Four character long helptext/x-comment can lead to
incorrect behaviour during file reading.
With checking it in sdf-po constructor we can prevent
this kind of po comming into existence.

Change-Id: I48cc8f34d2c1ca8b86baea25384f5b697f16dd66
2012-10-10 14:56:40 +02:00
Zolnai Tamás
1ef83f535f Use _t suffix for typedef
Change-Id: I8501739e9fb1b184facebc406ed6e20de1f7ab0a
2012-10-09 22:31:23 +02:00
Zolnai Tamás
63af8783bc Use static, lcl_ and anonymus namespace
for local functions

Change-Id: I0393c9552ca353e80ac61d258a280cbcd53e1cba
2012-10-09 22:05:24 +02:00
Zolnai Tamás
961728d58c Make renewpo to ignore double id in xml/xrm
Change-Id: I01329beded3e81040726f525cdb5886b5f3a8c63
2012-10-08 23:03:00 +02:00
Zolnai Tamás
247bac3266 Make an end of xrmex id duplication
Use GroupId instead of LocalId because that is
the primary id. Thus usage of LocalId becomes
unneeded.

Change-Id: I2770141fab47c07294ab15322848e8aef0de2cec
2012-10-08 22:53:14 +02:00
Andras Timar
6134c08251 typos
Change-Id: Idb23b390af270bdd694ecce9ab14f47d25af8f57
2012-10-08 19:36:55 +02:00
Zolnai Tamás
73ed390a7f Correct wrong memory addressing
Some global variables in export.cxx and
cfgmerge.cxx pointed to OString databuffer
and after these strings are destroyed the pointers
refered to invalid address.
Use OString instead of const char*

Change-Id: I4ea43f4b3772ef3370d79336559d39a67400fe2b
2012-10-08 18:23:31 +02:00
Zolnai Tamás
f73618e9de Move propex/propmerge code to C++
Changes:
-Use same methods and commandline params
 as other localizers
-Work with one lang during mergeing
-Work well with comments
-Correct makefiles according to one lang concept

Plus delete propex.bat to avoid conflicts

Change-Id: Ia9d2886db263c31f29692c3f6da2b8ec6542b564
2012-10-08 17:14:20 +02:00
Zolnai Tamás
f9e4d3bfe8 Make Export::handleArguments method safer
-Check wheather input and output file are given
-Return with "empty" HandledArgs when input is
invalid
-Delete plus conditions from helpex and lngex

Change-Id: I418b1ecaab5f0c78197845448ab062aa5d3ba4de
2012-10-07 11:42:37 +02:00
Zolnai Tamás
a418748140 Extract argument-handling to one source file
Plus cleanup
-Delete unneeded global variables
-Delete -e input flag in general
-Delete helpex's -x, -y and -lf input flags
These are all unused

Change-Id: I83db62543a728ed75fa6893c45566f11d1237c69
2012-10-05 15:29:40 +02:00
Zolnai Tamás
2146c00da0 Ulfex ignores comments during extraction too
During string extraction this does not cause
real problem but causes unnecessary operations.
Plus make isNextGroup not to change sLine_in
parameter.

Change-Id: I3db6a94ef320c096a7519f7f83dd4080d0588459
2012-10-03 19:44:15 +02:00
Zolnai Tamás
8ca8ea20e0 Correct ulfex to ignore comments
Change-Id: I50e41a3946ff885783006018f7b6ff2945cc7dfc
2012-10-03 19:43:51 +02:00
Zolnai Tamás
85c93d57c4 Ulfex ignores comments during extraction too
During string extraction this does not cause
real problem but causes unnecessary operations.
Plus make isNextGroup not to change sLine_in
parameter.

Change-Id: I3db6a94ef320c096a7519f7f83dd4080d0588459
2012-10-03 12:37:19 +02:00
Zolnai Tamás
afcfb2fb26 One little correction
Change-Id: I675bd8a966b2c1654cd6547fc380a51925578835
2012-10-03 10:31:34 +02:00
Zolnai Tamás
e3bf6418a8 Correct ulfex to ignore comments
Change-Id: I50e41a3946ff885783006018f7b6ff2945cc7dfc
2012-10-03 10:25:46 +02:00
Zolnai Tamás
8b22407ef3 Add some new checking
Plus use UpperCamelCase name for some
variable.

Change-Id: Iaba8b6f47f03b723aa31ef4b45f8b6fd78b7866f
2012-10-01 20:48:43 +02:00
Michael Meeks
e09e9bfb89 re-base on ALv2 code. 2012-10-01 13:55:41 +02:00
Zolnai Tamás
9d300551b3 Use new startsWith() method of OString
Change-Id: If8787b007767aa2701ff1b13883bcf33df12a8fc
Reviewed-on: https://gerrit.libreoffice.org/737
Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>
2012-09-30 18:31:34 +00:00
Zolnai Tamás
0359041aac Corrections for merge
-Correct po type-checking
-Use new "lang" variable instead of
nonexistent one
-Add input parameter to ulfex

Change-Id: I1dc17363179d69d40144b6a998eb1bf223bd05e9
Reviewed-on: https://gerrit.libreoffice.org/736
Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>
2012-09-30 18:31:08 +00:00
Zolnai Tamás
004f4fae87 Correct escaping tags
which worked wrong with some language like Asturian

Change-Id: Icd5939316ac84a3e569a9cbc04e38edda59dead1
Reviewed-on: https://gerrit.libreoffice.org/735
Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>
2012-09-30 15:16:55 +00:00
Zolnai Tamás
f1cbd2dc05 Use ascii charachters to seperate qtzi
Because previous used charachters cause warnings

Change-Id: I8715fc2a05df9d84b34945618184c99d54de6579
Reviewed-on: https://gerrit.libreoffice.org/731
Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>
2012-09-30 15:14:46 +00:00
Zolnai Tamás
4869d45d8e Make error message clearer in localize
which is written out when one of executables
writes out invalid sdf line

Change-Id: I167b31bf0f550222accdda8ee5a03d8e4a742d63
Reviewed-on: https://gerrit.libreoffice.org/730
Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>
2012-09-30 15:13:42 +00:00
Zolnai Tamás
0e138f246c Move setting of po msgid to constructor
because this is part of initialization

Change-Id: If6ebe46cea93e378c9060f2c3ced09ab44a3d82a
Reviewed-on: https://gerrit.libreoffice.org/729
Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>
2012-09-30 15:12:34 +00:00
Zolnai Tamás
ca12be682f Make Po classes robuster
-Make PoOfstream\PoIfstream classes for
checked po input\output
-Make copyability obvious
-Handle runtime errors with exceptions
-Use assertions to define exceptations
for programmers
Plus some correction
-Use simplier indentation
-In renewpo.cxx, define sdf file as a tempfile
instead of make it in current location
-Use constructor to renew poheader
-Use const where needed

Change-Id: Ic11ce3b9eee9a9fa9fbc4ccda154623160ad9d8a
Reviewed-on: https://gerrit.libreoffice.org/728
Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>
2012-09-30 15:11:53 +00:00
Zolnai Tamás
9baaced8b6 Not use initializer-list for vector
Change-Id: I6ed72b28be3ad00224cbf7308b4f27a6fb25e24e
Reviewed-on: https://gerrit.libreoffice.org/726
Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>
2012-09-30 15:11:29 +00:00