diff options
| author | Wu Xiaotian <[email protected]> | 2019-10-28 18:09:30 +0800 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2019-11-07 09:42:54 +0100 |
| commit | 9f1dd13e3990f2db9b656a093408dc230d3ec2c4 (patch) | |
| tree | 2ccd5e72c2e9b41b3d11d6e57bf06f01c8af7dcd | |
| parent | c5e729bc27c08860ed662a85d827492746010511 (diff) | |
| download | mate-polkit-9f1dd13e3990f2db9b656a093408dc230d3ec2c4.tar.bz2 mate-polkit-9f1dd13e3990f2db9b656a093408dc230d3ec2c4.tar.xz | |
migrate from intltool to gettext
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | po/Makevars | 78 | ||||
| -rw-r--r-- | po/POTFILES.in | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 11 | ||||
| -rw-r--r-- | src/polkit-mate-authentication-agent-1.desktop.in.in | 4 |
6 files changed, 90 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index 3b008ef..dcbc79c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = src po +SUBDIRS = po src DISTCHECK_CONFIGURE_FLAGS = \ CFLAGS='-Wno-deprecated-declarations' diff --git a/configure.ac b/configure.ac index a06af04..c0ad495 100644 --- a/configure.ac +++ b/configure.ac @@ -173,12 +173,12 @@ AC_SUBST(APPINDICATOR_LIBS) # ******************** # Internationalisation # ******************** - -IT_PROG_INTLTOOL([0.35.0]) +AM_GNU_GETTEXT_VERSION([0.19.8]) +AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.8]) +AM_GNU_GETTEXT([external]) GETTEXT_PACKAGE=mate-polkit AC_SUBST([GETTEXT_PACKAGE]) -AM_GLIB_GNU_GETTEXT AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[gettext domain]) # ************************************* diff --git a/po/Makevars b/po/Makevars new file mode 100644 index 0000000..8d493dc --- /dev/null +++ b/po/Makevars @@ -0,0 +1,78 @@ +# Makefile variables for PO directory in any package using GNU gettext. + +# Usually the message domain is the same as the package name. +DOMAIN = $(PACKAGE) + +# These two variables depend on the location of this directory. +subdir = po +top_builddir = .. + +# These options get passed to xgettext. +XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 --keyword=g_dngettext:2,3 --add-comments=Translators: + +# This is the copyright holder that gets inserted into the header of the +# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding +# package. (Note that the msgstr strings, extracted from the package's +# sources, belong to the copyright holder of the package.) Translators are +# expected to transfer the copyright for their translations to this person +# or entity, or to disclaim their copyright. The empty string stands for +# the public domain; in this case the translators are expected to disclaim +# their copyright. +COPYRIGHT_HOLDER = MATE Desktop Environment team + +# This tells whether or not to prepend "GNU " prefix to the package +# name that gets inserted into the header of the $(DOMAIN).pot file. +# Possible values are "yes", "no", or empty. If it is empty, try to +# detect it automatically by scanning the files in $(top_srcdir) for +# "GNU packagename" string. +PACKAGE_GNU = + +# This is the email address or URL to which the translators shall report +# bugs in the untranslated strings: +# - Strings which are not entire sentences, see the maintainer guidelines +# in the GNU gettext documentation, section 'Preparing Strings'. +# - Strings which use unclear terms or require additional context to be +# understood. +# - Strings which make invalid assumptions about notation of date, time or +# money. +# - Pluralisation problems. +# - Incorrect English spelling. +# - Incorrect formatting. +# It can be your email address, or a mailing list address where translators +# can write to without being subscribed, or the URL of a web page through +# which the translators can contact you. +MSGID_BUGS_ADDRESS = + +# This is the list of locale categories, beyond LC_MESSAGES, for which the +# message catalogs shall be used. It is usually empty. +EXTRA_LOCALE_CATEGORIES = + +# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt' +# context. Possible values are "yes" and "no". Set this to yes if the +# package uses functions taking also a message context, like pgettext(), or +# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument. +USE_MSGCTXT = no + +# These options get passed to msgmerge. +# Useful options are in particular: +# --previous to keep previous msgids of translated messages, +# --quiet to reduce the verbosity. +MSGMERGE_OPTIONS = + +# These options get passed to msginit. +# If you want to disable line wrapping when writing PO files, add +# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and +# MSGINIT_OPTIONS. +MSGINIT_OPTIONS = + +# This tells whether or not to regenerate a PO file when $(DOMAIN).pot +# has changed. Possible values are "yes" and "no". Set this to no if +# the POT file is checked in the repository and the version control +# program ignores timestamps. +PO_DEPENDS_ON_POT = yes + +# This tells whether or not to forcibly update $(DOMAIN).pot and +# regenerate PO files on "make dist". Possible values are "yes" and +# "no". Set this to no if the POT file and PO files are maintained +# externally. +DIST_DEPENDS_ON_UPDATE_PO = yes diff --git a/po/POTFILES.in b/po/POTFILES.in index f2b06d0..a99ecc1 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,6 +1,5 @@ # List of source files containing translatable strings. # Please keep this file sorted alphabetically. -[encoding: UTF-8] src/main.c src/polkitmateauthenticationdialog.c src/polkitmateauthenticator.c diff --git a/src/Makefile.am b/src/Makefile.am index 93f17f9..ac2131d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,15 +2,17 @@ FULL_LIBEXECDIR=$(libexecdir) desktopdir = $(sysconfdir)/xdg/autostart -desktop_DATA = polkit-mate-authentication-agent-1.desktop - -@INTLTOOL_DESKTOP_RULE@ +desktop_in_files = polkit-mate-authentication-agent-1.desktop.in +desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) polkit-mate-authentication-agent-1.desktop.in : polkit-mate-authentication-agent-1.desktop.in.in Makefile $(AM_V_GEN)sed \ -e "s|\@FULL_LIBEXECDIR\@|$(FULL_LIBEXECDIR)|" \ $< > $@ +$(desktop_DATA): $(desktop_in_files) + $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + libexec_PROGRAMS = polkit-mate-authentication-agent-1 polkit_mate_authentication_agent_1_SOURCES = \ @@ -45,8 +47,7 @@ polkit_mate_authentication_agent_1_LDADD = \ $(GLIB_LIBS) \ $(POLKIT_AGENT_LIBS) \ $(POLKIT_GOBJECT_LIBS) \ - $(APPINDICATOR_LIBS) \ - $(INTLLIBS) + $(APPINDICATOR_LIBS) EXTRA_DIST = \ polkit-mate-authentication-agent-1.desktop.in \ diff --git a/src/polkit-mate-authentication-agent-1.desktop.in.in b/src/polkit-mate-authentication-agent-1.desktop.in.in index 3685932..da1129a 100644 --- a/src/polkit-mate-authentication-agent-1.desktop.in.in +++ b/src/polkit-mate-authentication-agent-1.desktop.in.in @@ -1,6 +1,6 @@ [Desktop Entry] -_Name=PolicyKit Authentication Agent -_Comment=PolicyKit Authentication Agent for the MATE Desktop +Name=PolicyKit Authentication Agent +Comment=PolicyKit Authentication Agent for the MATE Desktop Exec=@FULL_LIBEXECDIR@/polkit-mate-authentication-agent-1 Terminal=false Type=Application |