Localization/Tools/Lbundle Check: Difference between revisions
(Initial revision.) |
(New features. Change in mapping format for track-unbundled.) |
||
Line 1: | Line 1: | ||
<!-- Localization/Tools/Lbundle_Check --> | |||
{{LocalizationBrowser| | {{LocalizationBrowser| | ||
Line 19: | Line 21: | ||
Before going through the setup examples, refresh the examples on organization of [[Localization/Concepts/Non_Text_Resources#Inside The Repository|lbundles in the repository]] (localizing the splash screen of the imaginary KDingus application). | Before going through the setup examples, refresh the examples on organization of [[Localization/Concepts/Non_Text_Resources#Inside The Repository|lbundles in the repository]] (localizing the splash screen of the imaginary KDingus application). | ||
As will become apparent below, to be able to track lbundle states, the translator (one of the coordinators) needs to have all original counterparts to localized resources checked out from the KDE repository, and in the same relative positions. E.g. for KDingus example as kdeutils application, checked out files could have the following structure: | As it will become apparent below, to be able to track lbundle states, the translator (one of the coordinators) needs to have all the original counterparts to localized resources checked out from the KDE repository, and in the same relative positions. E.g. for KDingus example as kdeutils application, checked out files could have the following structure: | ||
<code text> | <code text> | ||
$HOME/kde-svn | $HOME/kde-svn | ||
Line 46: | Line 48: | ||
kdingus-splash.png | kdingus-splash.png | ||
</code> | </code> | ||
except that this listing includes one new file, the <tt>l10n-spec</tt>. This is the setup file for tracking the lbundle, or rather, all lbundles on its level and beneath. | except that this listing includes one new file, the <tt>l10n-spec</tt>. This is the setup file for tracking the lbundle, or rather, all lbundles on its level and beneath. The files outside of <tt>l10n/</tt> subdirs are going to be called ''unbundled'', as they are not considered a part of lbundle proper. | ||
The <tt>l10n-spec</tt> files are composed of <tt>key = value</tt> fields per line | The <tt>l10n-spec</tt> files are composed of <tt>key = value</tt> fields per line. For the example above the content of <tt>l10n-spec</tt> would be: | ||
<code text> | <code text> | ||
# l10n-spec for KDingus' out-of-source bundle. | # l10n-spec for KDingus' out-of-source bundle. | ||
Line 55: | Line 57: | ||
bundle-vcs = svn | bundle-vcs = svn | ||
languages = aa | languages = aa | ||
track-unbundled = CMakeLists.txt | track-unbundled = CMakeLists.txt | ||
</code> | </code> | ||
The fields are | The fields used in the example are: | ||
; source-root: the root of the KDingus' sources in the KDE repository. This is needed to link the original counterparts to localized files. The path of the original file in the repository will be composed of this, plus the relative path of the localized file in the lbundle (relative to the <tt>l10n-spec</tt> file), and stripped of the <tt>l10n/aa/</tt> subpath. | ; source-root: the root of the KDingus' sources in the KDE repository. This is needed to link the original counterparts to localized files. The path of the original file in the repository will be composed of this, plus the relative path of the localized file in the lbundle (relative to the <tt>l10n-spec</tt> file), and stripped of the <tt>l10n/aa/</tt> subpath. | ||
Line 66: | Line 68: | ||
; languages: space-delimited list of languages expected in <tt>l10n</tt> subdirs. This is an optional field, which serves to check for naming errors with language subdirs. It may be left out, preventing such checks, but there is no reason to do so (especially for in-source bundles described below). | ; languages: space-delimited list of languages expected in <tt>l10n</tt> subdirs. This is an optional field, which serves to check for naming errors with language subdirs. It may be left out, preventing such checks, but there is no reason to do so (especially for in-source bundles described below). | ||
; track-unbundled: space-delimited list of pairs of file paths, | ; track-unbundled: space-delimited list of relative file paths, or pairs of file paths, of unbundled files which should be tracked nevertheless. In this example, <tt>CMakeLists.txt</tt> should be tracked because the installation instructions for the lbundle may need to change when those for the original resources change. A pair of file paths, as two space-separated paths within parenthesis (e.g. <tt>(foo.txt bar.txt)</tt>), can be given instead of a single file path when the local relative path needs to be different from that of the tracked original. A shell glob can be specified instead of a particular path (e.g. <tt>*.txt</tt>), but only for single paths, not in pairs. Backslash serves as escape character, e.g. when the file name contains a space. | ||
Several other fields, not used in this example, are available: | |||
; ignore-unbundled: space-delimited list of relative file paths which are to be completely ignored by the lbundle checker. For an out-of-source bundle, a file which is unbundled should be either tracked too (using <tt>track-unbundled</tt>) or ignored using this field, otherwise the checker will complain about it. Shell globs also possible. | |||
; strict-state: a boolean value stating whether the tracking state is to be strictly imposed. Non-strict means that out-of-sync states between localized and original resources are recorded only in the track file, whereas strict state means that the localized files names will be changed too to reflact the out-of-sync state. More details in section on [[#Operation|operation]]. | |||
; ignore- | ; ignore-substr: space-delimited list of substrings to ignore in names of bundled files when determining their original counterparts. This is never needed in KDE, but in other environments some localized files may be handled differently than a plain substitute for the original file, based on a substring in their name (e.g. a localized image may be overlayed over the original, rather than replacing it). | ||
The usual #-comments are allowed in <tt>l10n-spec</tt> files, as well as line continuation by trailing backslashes (e.g. when several | The usual #-comments are allowed in <tt>l10n-spec</tt> files, as well as line continuation by trailing backslashes (e.g. when several file paths are needed in <tt>track-unbundled</tt> field). | ||
=== In-Source Lbundles === | === In-Source Lbundles === | ||
Line 98: | Line 106: | ||
Since the lbundle is kept together with the application, sharing same root directory and version control system, there is no need for the <tt>source-root</tt> and <tt>bundle-vcs</tt> fields. In fact, presence or lack of <tt>source-root</tt> field identifies the bundle as out-of-source or in-source to the checker script. | Since the lbundle is kept together with the application, sharing same root directory and version control system, there is no need for the <tt>source-root</tt> and <tt>bundle-vcs</tt> fields. In fact, presence or lack of <tt>source-root</tt> field identifies the bundle as out-of-source or in-source to the checker script. | ||
Field <tt>track-unbundled</tt> (or <tt>ignore-unbundled</tt>) are not present either. All files which are unbundled are silently ignored. E.g. it is assumed that the KDingus' maintainer will modify and test install instructions so as to not break installation of localized resources. | |||
<tt>languages</tt> field could be omitted here as well, but for in-source lbundles it is even more important to keep tight check of wrongly named language subdirs. | <tt>languages</tt> field could be omitted here as well, but for in-source lbundles it is even more important to keep tight check of wrongly named language subdirs. | ||
Line 118: | Line 126: | ||
where <tt>-l aa</tt> is omitted since out-of-source bundles will contain only their own language. | where <tt>-l aa</tt> is omitted since out-of-source bundles will contain only their own language. | ||
So, what does <tt>lbundle-check.py</tt> actually do, and what does it report? For brevity, let's limit to the out-of-source lbundle for the KDingus as kdeutils app. After setting up the <tt>l10n-spec</tt> for that case (as detailed above), running <tt>lbundle-check.py</tt> for the first time would output: | So, what does <tt>lbundle-check.py</tt> actually do, and what does it report? For brevity, let's limit to the out-of-source lbundle for the KDingus as kdeutils app. After setting up the <tt>l10n-spec</tt> for that case (as detailed [[#Out-of-Source Lbundles|above]]), running <tt>lbundle-check.py</tt> for the first time would output: | ||
<code text> | <code text> | ||
$ cd $HOME/kde-svn/trunk/l10n-kde4 | $ cd $HOME/kde-svn/trunk/l10n-kde4 | ||
Line 129: | Line 137: | ||
$ | $ | ||
</code> | </code> | ||
creating the file <tt>aa/data/kdeutils/kdingus/pics/l10n-track</tt> with the following content: | creating the file <tt>aa/data/kdeutils/kdingus/pics/l10n-track</tt> in the process, with the following content: | ||
<code text> | <code text> | ||
# Do not edit manually, except to remove complete lines. | # Do not edit manually, except to remove complete lines. | ||
Line 141: | Line 149: | ||
(For a check, executing the same command line immediately for the second time would produce no output, nor change any files.) | (For a check, executing the same command line immediately for the second time would produce no output, nor change any files.) | ||
For each <tt>l10n-spec</tt> file encountered, <tt>lbundle-check.py</tt> will create one of these <tt>l10n-track</tt> files. <tt>l10n-track</tt> file, in each non-comment, non-empty line, contains four fields, in order: the state of the localized resource against the original, the relative path to the | For each <tt>l10n-spec</tt> file encountered, <tt>lbundle-check.py</tt> will create one of these <tt>l10n-track</tt> files. <tt>l10n-track</tt> file, in each non-comment, non-empty line, contains four fields, in order: the state of the localized resource against the original, the relative path to the bundled resource, the checksum of the ''original'' resource, and the VCS revision string of the original file which has this checksum. | ||
At this point, when <tt>l10n-spec</tt> file has been manually written, and <tt>l10n-track</tt> created by running the checker, both should be added and committed to version control. | At this point, when <tt>l10n-spec</tt> file has been manually written, and <tt>l10n-track</tt> created by running the checker, both should be added and committed to version control. | ||
So long as the original resource does not change, rerunning <tt>lbundle-check.py</tt> in the same way will do nothing, as everything is in sync. Obviously, the original resources should be updated to the latest version prior to checking, and <tt>lbundle-check.py</tt> | So long as the original resource does not change, rerunning <tt>lbundle-check.py</tt> in the same way will do nothing, as everything is in sync. Obviously, the original resources should be updated to the latest repository version prior to checking, and <tt>lbundle-check.py</tt> can do that itself if started with <tt>-u</tt> option: | ||
<code text> | <code text> | ||
$ lbundle-check.py -s $HOME/kde-svn -u aa/data | $ lbundle-check.py -s $HOME/kde-svn -u aa/data | ||
Line 183: | Line 191: | ||
Now the translator must find out, using the old revision string, what exactly happened to the original resource, and do the same for the localized one too. | Now the translator must find out, using the old revision string, what exactly happened to the original resource, and do the same for the localized one too. | ||
When the fuzzy or obsolete state has been resolved, localized resource updated to reflect changes in the original, it should be recorded as such. To do this, the entry for the resource is first manually deleted from <tt>l10n-track</tt> file, and then <tt>lbundle-check.py</tt> is rerun. This will recreate the entry with a fresh <tt>ok</tt> state. | When the fuzzy or obsolete state has been resolved, localized resource updated to reflect changes in the original, it should be recorded as such. To do this, the entry for the resource is first manually deleted from <tt>l10n-track</tt> file (the whole line is removed), and then <tt>lbundle-check.py</tt> is rerun. This will recreate the entry with a fresh <tt>ok</tt> state. | ||
If <tt>strict-state</tt> field has been set to true in <tt>l10n-spec</tt>, then not only the state of the entry in <tt>l10n-track</tt> is changed, but the tracked file itself is renamed to contain <tt>~fuzzy</tt> or <tt>~obsolete</tt> marker just before the extension. This mode is called strict because unless the out-of-sync state is corrected, the file is "misnamed" from the point of view of the runtime system, and will not be used instead of the original (it may even not get installed, depending on precise install instructions). | |||
To resolve the fuzzy or obsolete state in strict mode, it is not necessary to manually remove the entry from <tt>l10n-track</tt>. Instead, it is enough to put an updated version of the file (without the state maker in its name) next to the out-of-sync version, and rerun <tt>lbundle-check.py</tt>. It will remove the old version and update the entry in <tt>l10n-track</tt>. (The renaming/removal are version control aware, i.e. proper version control commands will be used for these operations if <tt>*-vcs</tt> fields have been set in the spec file.) |
Revision as of 02:45, 1 June 2008
On Localization | Tools |
Prerequisites | Subversion Ops, Localizing Non-Text Resources |
Related Articles | n/a |
External Reading | n/a |
About
The lbundle_check.py script checks and records the state of localized non-text resources organized in lbundles, allowing translators to track their relation to original resources. It lives in l10n-kde4/scripts/ directory in the appropriate branch in the KDE repository.
lbundle_check.py can be used to track both out-of-source and in-source lbundles, but the setup needed for these two modes is somewhat different. First the setup is explained for each type of lbundle, followed by the details of operation.
Setup
Before going through the setup examples, refresh the examples on organization of lbundles in the repository (localizing the splash screen of the imaginary KDingus application).
As it will become apparent below, to be able to track lbundle states, the translator (one of the coordinators) needs to have all the original counterparts to localized resources checked out from the KDE repository, and in the same relative positions. E.g. for KDingus example as kdeutils application, checked out files could have the following structure:
$HOME/kde-svn
trunk/
l10n-kde4/
aa/
KDE/
kdeutils/
kdingus/
To have it like this without checking out full parent directories, one can use -N option to svn checkout, which avoids recursion into subdirectories.
Out-of-Source Lbundles
When it was assumed that KDingus is living in kdeutils, a core KDE module, its out-of-source lbundle for the language aa was organized like this:
/trunk/l10n-kde4/aa/data/kdeutils/
CMakeLists.txt
kdingus/
CMakeLists.txt
pics/
CMakeLists.txt
l10n-spec
l10n/
aa/
kdingus-splash.png
except that this listing includes one new file, the l10n-spec. This is the setup file for tracking the lbundle, or rather, all lbundles on its level and beneath. The files outside of l10n/ subdirs are going to be called unbundled, as they are not considered a part of lbundle proper.
The l10n-spec files are composed of key = value fields per line. For the example above the content of l10n-spec would be:
- l10n-spec for KDingus' out-of-source bundle.
source-root = trunk/KDE/kdeutils/kdingus
source-vcs = svn
bundle-vcs = svn
languages = aa
track-unbundled = CMakeLists.txt
The fields used in the example are:
- source-root
- the root of the KDingus' sources in the KDE repository. This is needed to link the original counterparts to localized files. The path of the original file in the repository will be composed of this, plus the relative path of the localized file in the lbundle (relative to the l10n-spec file), and stripped of the l10n/aa/ subpath.
- source-vcs, bundle-vcs
- the version control systems used by the source code and the lbundle, respectively. These are needed so that the checker script knows how to update the sources (if requested), and to avoid trying to track version control bookkeeping files in the lbundle (e.g. .svn subdirs for SVN). Currently the only known VCS is svn, but the script abstracts this internally, so that other may be added in the future.
- languages
- space-delimited list of languages expected in l10n subdirs. This is an optional field, which serves to check for naming errors with language subdirs. It may be left out, preventing such checks, but there is no reason to do so (especially for in-source bundles described below).
- track-unbundled
- space-delimited list of relative file paths, or pairs of file paths, of unbundled files which should be tracked nevertheless. In this example, CMakeLists.txt should be tracked because the installation instructions for the lbundle may need to change when those for the original resources change. A pair of file paths, as two space-separated paths within parenthesis (e.g. (foo.txt bar.txt)), can be given instead of a single file path when the local relative path needs to be different from that of the tracked original. A shell glob can be specified instead of a particular path (e.g. *.txt), but only for single paths, not in pairs. Backslash serves as escape character, e.g. when the file name contains a space.
Several other fields, not used in this example, are available:
- ignore-unbundled
- space-delimited list of relative file paths which are to be completely ignored by the lbundle checker. For an out-of-source bundle, a file which is unbundled should be either tracked too (using track-unbundled) or ignored using this field, otherwise the checker will complain about it. Shell globs also possible.
- strict-state
- a boolean value stating whether the tracking state is to be strictly imposed. Non-strict means that out-of-sync states between localized and original resources are recorded only in the track file, whereas strict state means that the localized files names will be changed too to reflact the out-of-sync state. More details in section on operation.
- ignore-substr
- space-delimited list of substrings to ignore in names of bundled files when determining their original counterparts. This is never needed in KDE, but in other environments some localized files may be handled differently than a plain substitute for the original file, based on a substring in their name (e.g. a localized image may be overlayed over the original, rather than replacing it).
The usual #-comments are allowed in l10n-spec files, as well as line continuation by trailing backslashes (e.g. when several file paths are needed in track-unbundled field).
In-Source Lbundles
For KDingus living as an extragear app, its directory structure with the in-source lbundle having aa and bb languages, and an l10n-spec file, would be this:
/trunk/extragear/utils/
kdingus/
CMakeLists.txt
pics/
CMakeLists.txt
kdingus-splash.png
l10n-spec
l10n/
aa/
kdingus-splash.png
bb/
kdingus-splash.png
and the contents of l10n-spec somewhat simpler than for out-of-source lbundles:
- l10n-spec for KDingus' in-source bundle.
source-vcs = svn
languages = aa bb
Since the lbundle is kept together with the application, sharing same root directory and version control system, there is no need for the source-root and bundle-vcs fields. In fact, presence or lack of source-root field identifies the bundle as out-of-source or in-source to the checker script.
Field track-unbundled (or ignore-unbundled) are not present either. All files which are unbundled are silently ignored. E.g. it is assumed that the KDingus' maintainer will modify and test install instructions so as to not break installation of localized resources.
languages field could be omitted here as well, but for in-source lbundles it is even more important to keep tight check of wrongly named language subdirs.
Operation
If the repository is checked out as exemplified above, to check all lbundles for the language aa in trunk, lbundle-check.py can be run like this:
$ cd $HOME/kde-svn/
$ lbundle-check.py -s $HOME/kde-svn -l aa trunk/
This will process all lbundles found in trunk/, whether out-of-source or in-source, containing the language aa. (If -l option weren't specified, it would check all languages in trunk/.) Option -s states the top local directory of the repository, which is needed to resolve original resource paths for out-of-source bundles (path in field source-root from l10n-spec files is appended to it).
Or, to check only out-of-source bundles in the trunk/l10n-kde4/aa/data, one would use:
$ cd $HOME/kde-svn/trunk/l10n-kde4
$ lbundle-check.py -s $HOME/kde-svn aa/data
where -l aa is omitted since out-of-source bundles will contain only their own language.
So, what does lbundle-check.py actually do, and what does it report? For brevity, let's limit to the out-of-source lbundle for the KDingus as kdeutils app. After setting up the l10n-spec for that case (as detailed above), running lbundle-check.py for the first time would output:
$ cd $HOME/kde-svn/trunk/l10n-kde4
$ lbundle-check.py -s $HOME/kde-svn aa/data
! aa/data/kdeutils/kdingus/pics/l10n-track
Added to tracking: 2
aa/data/kdeutils/kdingus/pics/CMakeLists.txt
aa/data/kdeutils/kdingus/pics/l10n/aa/kdingus-splash.png
$
creating the file aa/data/kdeutils/kdingus/pics/l10n-track in the process, with the following content:
- Do not edit manually, except to remove complete lines.
- -
ok ¦CMakeLists.txt¦ 865f7...e926d 755260
- aa
ok ¦l10n/aa/kdingus-splash.png¦ 37c4a7...8fe3a 755647
(For a check, executing the same command line immediately for the second time would produce no output, nor change any files.)
For each l10n-spec file encountered, lbundle-check.py will create one of these l10n-track files. l10n-track file, in each non-comment, non-empty line, contains four fields, in order: the state of the localized resource against the original, the relative path to the bundled resource, the checksum of the original resource, and the VCS revision string of the original file which has this checksum.
At this point, when l10n-spec file has been manually written, and l10n-track created by running the checker, both should be added and committed to version control.
So long as the original resource does not change, rerunning lbundle-check.py in the same way will do nothing, as everything is in sync. Obviously, the original resources should be updated to the latest repository version prior to checking, and lbundle-check.py can do that itself if started with -u option:
$ lbundle-check.py -s $HOME/kde-svn -u aa/data
svn up /home/.../kdeutils/kdingus/pics/CMakeLists.txt
At revision 762512.
svn up /home/.../kdeutils/kdingus/pics/kdingus-splash.png
At revision 762512.
$
Once the original resource is modified, e.g. KDingus' splash screen is souped up, lbundle-check.py will report the following:
$ lbundle-check.py -s $HOME/kde-svn aa/data
! aa/data/kdeutils/kdingus/pics/l10n-track
Newly fuzzied: 1
aa/data/kdeutils/kdingus/pics/l10n/aa/kdingus-splash.png
and its entry in l10n-track will state:
fuzzy ¦l10n/aa/kdingus-splash.png¦ 37c4a7...8fe3a 755647
i.e. only the status will have changed from ok to fuzzy. Now the translator has the information needed to compare what has changed in the original splash image: this entry still states the revision of the previous original splash, on which the localized one was based.
If the original resource is renamed, moved, or deleted, the report will be slightly different:
$ lbundle-check.py -s $HOME/kde-svn aa/data
! aa/data/kdeutils/kdingus/pics/l10n-track
Newly obsoleted: 1
aa/data/kdeutils/kdingus/pics/l10n/aa/kdingus-splash.png
and the entry in l10n-track:
obsolete ¦l10n/aa/kdingus-splash.png¦ 37c4a7...8fe3a 755647
Now the translator must find out, using the old revision string, what exactly happened to the original resource, and do the same for the localized one too.
When the fuzzy or obsolete state has been resolved, localized resource updated to reflect changes in the original, it should be recorded as such. To do this, the entry for the resource is first manually deleted from l10n-track file (the whole line is removed), and then lbundle-check.py is rerun. This will recreate the entry with a fresh ok state.
If strict-state field has been set to true in l10n-spec, then not only the state of the entry in l10n-track is changed, but the tracked file itself is renamed to contain ~fuzzy or ~obsolete marker just before the extension. This mode is called strict because unless the out-of-sync state is corrected, the file is "misnamed" from the point of view of the runtime system, and will not be used instead of the original (it may even not get installed, depending on precise install instructions).
To resolve the fuzzy or obsolete state in strict mode, it is not necessary to manually remove the entry from l10n-track. Instead, it is enough to put an updated version of the file (without the state maker in its name) next to the out-of-sync version, and rerun lbundle-check.py. It will remove the old version and update the entry in l10n-track. (The renaming/removal are version control aware, i.e. proper version control commands will be used for these operations if *-vcs fields have been set in the spec file.)