diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-11-13 13:30:39 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-11-13 21:35:28 +0100 |
| commit | c81217920effddc93fb780cf8f9eb699d6fe1319 (patch) | |
| tree | 9329d39638ffac8fa7fc3fd8c03c9530e66dacf6 /src/locale | |
| parent | f38326f21aaf96c76d56c5d69f8515eb7039eae8 (diff) | |
| download | systemd-c81217920effddc93fb780cf8f9eb699d6fe1319.tar.gz | |
i18n: drop intltool use, use meson's merge_file directly
This didn't work during the initial conversion to meson, but should now.
A sufficiently new polkit is also required, for the .its rules files.
Note that https://github.com/mesonbuild/meson/blob/master/docs/markdown/i18n-module.md
says that 'install' argument was added in meson 0.43.0. If this is accurate,
warnigs might be generated with older mesons. Fedora has 0.43.0 across the
board, but other distros probably don't, but I guess that a warning is
prefereable to having to update do latest meson.
The advantages are:
- one less dependency (intltool)
- using the generic implementation instead of our open-coded calls
- we don't need to use the fake "_" prefixes in XML
Replaces #1609, fixes #7300.
Diffstat (limited to 'src/locale')
| -rw-r--r-- | src/locale/meson.build | 4 | ||||
| -rw-r--r-- | src/locale/org.freedesktop.locale1.policy.in | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/locale/meson.build b/src/locale/meson.build index e9de6089f3..a0411fb1a6 100644 --- a/src/locale/meson.build +++ b/src/locale/meson.build @@ -12,11 +12,11 @@ if conf.get('ENABLE_LOCALED') == 1 install_data('org.freedesktop.locale1.service', install_dir : dbussystemservicedir) - custom_target( + i18n.merge_file( 'org.freedesktop.locale1.policy', input : 'org.freedesktop.locale1.policy.in', output : 'org.freedesktop.locale1.policy', - command : intltool_command, + po_dir : po_dir, install : install_polkit, install_dir : polkitpolicydir) endif diff --git a/src/locale/org.freedesktop.locale1.policy.in b/src/locale/org.freedesktop.locale1.policy.in index df63845e9b..575a1ffaaf 100644 --- a/src/locale/org.freedesktop.locale1.policy.in +++ b/src/locale/org.freedesktop.locale1.policy.in @@ -17,8 +17,8 @@ <vendor_url>http://www.freedesktop.org/wiki/Software/systemd</vendor_url> <action id="org.freedesktop.locale1.set-locale"> - <_description>Set system locale</_description> - <_message>Authentication is required to set the system locale.</_message> + <description>Set system locale</description> + <message>Authentication is required to set the system locale.</message> <defaults> <allow_any>auth_admin_keep</allow_any> <allow_inactive>auth_admin_keep</allow_inactive> @@ -28,8 +28,8 @@ </action> <action id="org.freedesktop.locale1.set-keyboard"> - <_description>Set system keyboard settings</_description> - <_message>Authentication is required to set the system keyboard settings.</_message> + <description>Set system keyboard settings</description> + <message>Authentication is required to set the system keyboard settings.</message> <defaults> <allow_any>auth_admin_keep</allow_any> <allow_inactive>auth_admin_keep</allow_inactive> |