Attachment 137232 Details for Bug 104273 – Migrate from Intltool to Gettext

[patch] Migrate from Intltool to Gettext

0001-Migrate-from-Intltool-to-Gettext.patch (text/plain), 3.82 KB, created by Iñigo Martínez on 2018-02-08 10:55:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Iñigo Martínez

Created: 2018-02-08 10:55:47 UTC

Size: 3.82 KB

patch

obsolete

>From 48e828089925c8ce83ee0aff533f2f7569a50eba Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?I=C3=B1igo=20Mart=C3=ADnez?= <inigomartinez@gmail.com>
>Date: Thu, 8 Feb 2018 11:53:17 +0100
>Subject: [PATCH] Migrate from Intltool to Gettext
>
>Recent versions of Gettext are able to translate several formats
>that are used in GNOME applications. This patch migrates from
>Intltool to Gettext by using meson's i18n features.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=104273
>---
> data/meson.build                        |  4 ++--
> data/org.freedesktop.accounts.policy.in | 16 ++++++++--------
> meson.build                             |  5 -----
> 3 files changed, 10 insertions(+), 15 deletions(-)
>
>diff --git a/data/meson.build b/data/meson.build
>index 21a4dc4..aa5f303 100644
>--- a/data/meson.build
>+++ b/data/meson.build
>@@ -28,11 +28,11 @@ configure_file(
> 
> policy = 'org.freedesktop.accounts.policy'
> 
>-custom_target(
>+i18n.merge_file(
>   policy,
>   input: policy + '.in',
>   output: policy,
>-  command: intltool_xml_cmd,
>+  po_dir: po_dir,
>   install: true,
>   install_dir: polkit_dir
> )
>diff --git a/data/org.freedesktop.accounts.policy.in b/data/org.freedesktop.accounts.policy.in
>index d149399..0169ae8 100644
>--- a/data/org.freedesktop.accounts.policy.in
>+++ b/data/org.freedesktop.accounts.policy.in
>@@ -8,8 +8,8 @@
>   <icon_name>stock_person</icon_name>
> 
>   <action id="org.freedesktop.accounts.change-own-user-data">
>-    <_description>Change your own user data</_description>
>-    <_message>Authentication is required to change your own user data</_message>
>+    <description>Change your own user data</description>
>+    <message>Authentication is required to change your own user data</message>
>     <defaults>
>       <allow_any>yes</allow_any>
>       <allow_inactive>yes</allow_inactive>
>@@ -18,8 +18,8 @@
>   </action>
> 
>   <action id="org.freedesktop.accounts.change-own-password">
>-    <_description>Change your own user password</_description>
>-    <_message>Authentication is required to change your own user password</_message>
>+    <description>Change your own user password</description>
>+    <message>Authentication is required to change your own user password</message>
>     <defaults>
>       <allow_any>auth_admin</allow_any>
>       <allow_inactive>auth_admin</allow_inactive>
>@@ -28,8 +28,8 @@
>   </action>
> 
>   <action id="org.freedesktop.accounts.user-administration">
>-    <_description>Manage user accounts</_description>
>-    <_message>Authentication is required to change user data</_message>
>+    <description>Manage user accounts</description>
>+    <message>Authentication is required to change user data</message>
>     <defaults>
>       <allow_any>auth_admin</allow_any>
>       <allow_inactive>auth_admin</allow_inactive>
>@@ -38,8 +38,8 @@
>   </action>
> 
>   <action id="org.freedesktop.accounts.set-login-option">
>-    <_description>Change the login screen configuration</_description>
>-    <_message>Authentication is required to change the login screen configuration</_message>
>+    <description>Change the login screen configuration</description>
>+    <message>Authentication is required to change the login screen configuration</message>
>     <defaults>
>       <allow_any>auth_admin</allow_any>
>       <allow_inactive>auth_admin</allow_inactive>
>diff --git a/meson.build b/meson.build
>index 3af4ba3..a1c5e6d 100644
>--- a/meson.build
>+++ b/meson.build
>@@ -195,11 +195,6 @@ pkg = import('pkgconfig')
> data_dir = join_paths(meson.source_root(), 'data')
> po_dir = join_paths(meson.source_root(), 'po')
> 
>-intltool_merge = find_program('intltool-merge')
>-intltool_cache = join_paths(po_dir, '.intltool-merge-cache')
>-intltool_desktop_cmd = [intltool_merge, '-d', '-u', '-c', intltool_cache, po_dir, '@INPUT@', '@OUTPUT@']
>-intltool_xml_cmd = [intltool_merge, '-x', '-u', '-c', intltool_cache, po_dir, '@INPUT@', '@OUTPUT@']
>-
> top_inc = include_directories('.')
> 
> subdir('data')
>-- 
>2.16.1
>

Actions: View | Splinter Review

Attachments on bug 104273: 137230 | 137231 | 137232 | 137318 | 137319

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.