Review Request 122937: Preserve translation domain when merging KXmlGui files

[Chusslove Illich]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/122937/
-----------------------------------------------------------

(Updated March 18, 2015, 12:30 p.m.)


Status
------

This change has been marked as submitted.


Review request for KDE Frameworks, David Faure and Lasse Liehu.


Changes
-------

Submitted with commit 2920e946c24d78eb0b6b3038a9cc38a8897ce4ac by Chusslove Illich (?????? ????) to branch master.


Repository: kxmlgui


Description
-------

When two .rc documents that specify different translation domains are merged, only one of the two domains will appear in the merged document. This breaks translation of text elements under the dropped domain. To fix it, the top domain attribute (or the application domain) should be propagated to each text element before merging. Then, at the moment of translation, the local domain attribute should take priority over the top attribute (or the application domain).

This fix also works if the merged document is written out and later loaded. Hence the local translation domain attribute is added to schemas as well.

Reference bug report: https://bugs.kde.org/show_bug.cgi?id=342976


Diffs
-----

  src/kedittoolbar.cpp 40c8bd6 
  src/kpartgui.dtd 587cd8e 
  src/ktoolbar.cpp f79a149 
  src/kxmlgui.xsd bca02f1 
  src/kxmlguibuilder.cpp d4cfa7a 
  src/kxmlguiclient.cpp 12d3f44 

Diff: https://git.reviewboard.kde.org/r/122937/diff/


Testing
-------

Tested an application that previously had an untranslated menu title due to this issue, now it is translated.


Thanks,

Chusslove Illich

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-frameworks-devel/attachments/20150318/1233ce92/attachment-0001.html>