TDE
/
tdelibs
7
1
Fork 0
Code Issues 16 Pull Requests 8 Releases Wiki Activity
Labels Milestones

Add CMakeL10n rules. #8

Merged
SlavekB merged 1 commits from feat/CMakeL10n into master 5 years ago
Conversation 2 Commits 1 Files Changed 38
SlavekB commented 5 years ago
Owner

The attached rules should work well enough. However, it would be useful to add support to tde_create_l10n_template macro for EXCLUDES to be an easy way to exclude some nested directories or files. For example, to avoid repeating string from the nested directory in the catalog from the parent directory. Or to exclude directories, such as tests performed during building.

The rules contain some useful things and some hacks:

  1. Instead of merging qt-messages.pot, which is not regularly updated, strings are extracted directly from ../dependencies/tqt3/src. As a result, the TQt3 strings will be up to date. And qt-messages.pot will no longer be needed.
  2. To extract the strings from the tqt3/src/xml/qxml.cpp file properly, #define is hidden before extracting. After extracting, the original file is restored.
  3. The tdeui/colors/rgb.txt file is modified to format as C source before extracting strings with color names. After extracting, the original file is restored.
  4. The tdeprint/cups/cupsdconf2/cupsd.conf.template file is modified to format as C source before extracting strings for CUPS configuration. After extracting, the original file is restored.

Thanks to editing files in place, POT files point to the correct lines in existing files.

The attached rules should work well enough. However, it would be useful to add support to `tde_create_l10n_template` macro for `EXCLUDES` to be an easy way to exclude some nested directories or files. For example, to avoid repeating string from the nested directory in the catalog from the parent directory. Or to exclude directories, such as tests performed during building. The rules contain some useful things and some hacks: 1. Instead of merging `qt-messages.pot`, which is not regularly updated, strings are extracted directly from [`../dependencies/tqt3/src`](../tqt3/src/branch/master/src/). As a result, the TQt3 strings will be up to date. And `qt-messages.pot` will no longer be needed. 2. To extract the strings from the [`tqt3/src/xml/qxml.cpp`](../tqt3/src/branch/master/src/xml/qxml.cpp#L56) file properly, `#define` is hidden before extracting. After extracting, the original file is restored. 3. The [`tdeui/colors/rgb.txt`](src/branch/master/tdeui/colors/rgb.txt) file is modified to format as C source before extracting strings with color names. After extracting, the original file is restored. 4. The [`tdeprint/cups/cupsdconf2/cupsd.conf.template`](src/branch/master/tdeprint/cups/cupsdconf2/cupsd.conf.template) file is modified to format as C source before extracting strings for CUPS configuration. After extracting, the original file is restored. Thanks to editing files in place, POT files point to the correct lines in existing files.
SlavekB commented 5 years ago
Poster
Owner

Added commits already use EXCLUDES – see TDE/tde-common-cmake#4.

Added commits already use `EXCLUDES` – see TDE/tde-common-cmake#4.
MicheleC reviewed 5 years ago
MicheleC left a comment
Owner

mostly ok, some point to discuss together

mostly ok, some point to discuss together
CMakeL10n.txt Outdated
##### verify tqt3 sources #######################
if( NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../dependencies/tqt3/src )
MicheleC commented 5 years ago
Owner

Is it possible to look for tqt3 module path rather than using a relative path? This is because with relative path, the functionality would stop working if we move tqt3 so a different place.

This is a general observation, which is probably applicable in other parts/modules as well.

Is it possible to look for tqt3 module path rather than using a relative path? This is because with relative path, the functionality would stop working if we move tqt3 so a different place. This is a general observation, which is probably applicable in other parts/modules as well.
CMakeL10n.txt Outdated
file( RENAME
${CMAKE_CURRENT_SOURCE_DIR}/../dependencies/tqt3/src/xml/qxml.cpp
${CMAKE_CURRENT_SOURCE_DIR}/../dependencies/tqt3/src/xml/qxml.orig
)
MicheleC commented 5 years ago
Owner

as for cmake #5, renaming of files could cause problems when the process is halted half way. Suggest we consider copy and work on the copied file instead of the original, if this does not cause problem with POT pointing to wrong files.

Or is there a way to get POT to point to original file even when working on a copy?

as for cmake #5, renaming of files could cause problems when the process is halted half way. Suggest we consider copy and work on the copied file instead of the original, if this does not cause problem with POT pointing to wrong files. Or is there a way to get POT to point to original file even when working on a copy?
CMakeL10n.txt Outdated
##### restore tqt3/src/xml/qxml.cpp #############
if( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../dependencies/tqt3/src/xml/qxml.orig )
MicheleC commented 5 years ago
Owner

do we need to delete "${CMAKE_CURRENT_SOURCE_DIR}/../dependencies/tqt3/src/xml/qxml.cpp" before the rename is done?

do we need to delete "${CMAKE_CURRENT_SOURCE_DIR}/../dependencies/tqt3/src/xml/qxml.cpp" before the rename is done?
arts/kde/mcop-dcop/CMakeL10n.txt
tde_l10n_create_template(
CATALOG "kmcop"
DESTINATION "../../../../tde-i18n/template/messages/tdelibs"
MicheleC commented 5 years ago
Owner

as above, finding the location of tde-i18n would be preferred over using a relative location.

Same comment applies in various other files in this PR, I will not comment on those cases.

We should consider the idea of modifying "tde_l10n_create_template" so that we specify destination module and relative destination path. then the macro will search for the module (most of the time it would be tde-i18n but sometimes it could be an application module, like koffice-i18n).

as above, finding the location of tde-i18n would be preferred over using a relative location. Same comment applies in various other files in this PR, I will not comment on those cases. We should consider the idea of modifying "tde_l10n_create_template" so that we specify destination module and relative destination path. then the macro will search for the module (most of the time it would be tde-i18n but sometimes it could be an application module, like koffice-i18n).
cmake
Subproject commit 451ca41345a5fea5539f95829026cee9cb3ad118
MicheleC commented 5 years ago
Owner

cmake submodule commit hash change should not be part of this PR, IMO.

cmake submodule commit hash change should not be part of this PR, IMO.
tdeprint/cups/cupsdconf2/CMakeL10n.txt
set( _conf_context "Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, etc.)" )
file( STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/cupsd.conf.template _conf_template )
file( RENAME
MicheleC commented 5 years ago
Owner

same comment as for "tqt3/src/xml/qxml.cpp" applies here on modifying existing file and then write back

same comment as for "tqt3/src/xml/qxml.cpp" applies here on modifying existing file and then write back
tdeprint/cups/cupsdconf2/CMakeL10n.txt
##### restore original cupsd.conf.template ######
file( RENAME
MicheleC commented 5 years ago
Owner

as above, do we need to delete original file before renaming from .orig ?

as above, do we need to delete original file before renaming from .orig ?
tdeui/colors/CMakeL10n.txt
##### change rgb.txt to format as C source ######
file( READ "${CMAKE_CURRENT_SOURCE_DIR}/rgb.txt" _colorsRC )
file( RENAME "${CMAKE_CURRENT_SOURCE_DIR}/rgb.txt" "${CMAKE_CURRENT_SOURCE_DIR}/rgb.orig" )
MicheleC commented 5 years ago
Owner

same comment as for “tqt3/src/xml/qxml.cpp” applies here on modifying existing file and then write back

same comment as for “tqt3/src/xml/qxml.cpp” applies here on modifying existing file and then write back
tdeui/colors/CMakeL10n.txt
##### restore original rgb.txt ##################
file( RENAME "${CMAKE_CURRENT_SOURCE_DIR}/rgb.orig" "${CMAKE_CURRENT_SOURCE_DIR}/rgb.txt" )
MicheleC commented 5 years ago
Owner

as above, do we need to delete original file before renaming from .orig ?

as above, do we need to delete original file before renaming from .orig ?
SlavekB commented 5 years ago
Poster
Owner

Commits squashed to one and updated to the current TDEL10n module options.

Commits squashed to one and updated to the current TDEL10n module options.
MicheleC approved these changes 5 years ago
MicheleC left a comment
Owner

looks ok now

looks ok now
SlavekB closed this pull request 5 years ago
SlavekB deleted branch feat/CMakeL10n 5 years ago
SlavekB added this to the R14.0.6 release milestone 5 years ago
The pull request has been merged as e532d9345d.
Sign in to join this conversation.
Reviewers
Request review
No reviewers
Labels
Apply labels
Clear labels
GE/need-info
General - need additional info from contributor PR/keep-branch
Pull request - do not delete branch after merging PR/not-ok
Pull request - need fixing PR/rfc
Pull request - request for comments PR/update-trans
Pull request - update to translation files needed PR/wip
Pull request - work in progress RS/R14.0.x
Related to R14.0.x series RS/R14.1.x
Related to R14.1.x series SL/critical
Severity level - critical SL/major
Severity level - major SL/minor
Severity level - minor SL/normal
Severity level - normal SL/regression
Severity level - regression from previous version SL/trivial
Severity level - trivial SL/wishlist
Severity level - wishlist request ST/duplicate
Status - duplicate of another issue ST/invalid
Status - invalid report ST/notourproblem
Status - not our problem ST/rejected
Status - rejected ST/wontfix
Status - won't fix ST/worksforme
Status - works for me, unable to reproduce
No Label GE/need-info PR/keep-branch PR/not-ok PR/rfc PR/update-trans PR/wip RS/R14.0.x RS/R14.1.x SL/critical SL/major SL/minor SL/normal SL/regression SL/trivial SL/wishlist ST/duplicate ST/invalid ST/notourproblem ST/rejected ST/wontfix ST/worksforme
Milestone
Set milestone
Clear milestone
No items
No Milestone
R14.0.6 release
Assignees
Assign users
Clear assignees
No Assignees
2 Participants
Notifications
Due Date

No due date set.

Dependencies

No dependencies set.

Reference: TDE/tdelibs#8
Write Preview
Loading…
Cancel
Save
There is no content yet.
Delete Branch 'feat/CMakeL10n'

Deleting a branch is permanent. It CANNOT be undone. Continue?

No
Yes