diff options
| author | Wu Xiaotian <[email protected]> | 2019-05-10 21:44:13 +0800 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2019-05-15 12:28:30 +0200 |
| commit | b5dfa41511029b8cb0bc5fc2c7d3f04118ecb6b7 (patch) | |
| tree | 1969a3de353da2382deed753402959bff4851bf5 | |
| parent | 3af866af0eb6a52a415bb39d4a582368bf1e3c0c (diff) | |
| download | mozo-b5dfa41511029b8cb0bc5fc2c7d3f04118ecb6b7.tar.bz2 mozo-b5dfa41511029b8cb0bc5fc2c7d3f04118ecb6b7.tar.xz | |
Migrate from intltool to gettext
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | data/Makefile.am | 5 | ||||
| -rw-r--r-- | data/mozo.desktop.in.in | 4 | ||||
| -rw-r--r-- | po/Makevars | 78 | ||||
| -rw-r--r-- | po/POTFILES.in | 3 |
6 files changed, 87 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index 3877c16..8fec907 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = data po Mozo +SUBDIRS = po data Mozo CLEANFILES= diff --git a/configure.ac b/configure.ac index f9f3c86..0c5c1d7 100644 --- a/configure.ac +++ b/configure.ac @@ -15,8 +15,8 @@ ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" GETTEXT_PACKAGE=mozo AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package]) -AM_GLIB_GNU_GETTEXT -IT_PROG_INTLTOOL([0.40.0]) +AM_GNU_GETTEXT_VERSION([0.19.8]) +AM_GNU_GETTEXT([external]) AM_PATH_PYTHON(3.5) diff --git a/data/Makefile.am b/data/Makefile.am index daa2b1d..e7462de 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,11 +1,12 @@ SUBDIRS = icons -@INTLTOOL_DESKTOP_RULE@ - desktopdir = $(datadir)/applications desktop_in_files = mozo.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) +$(desktop_DATA): $(desktop_in_files) + $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + man_MANS = mozo.1 pkgdata_DATA = mozo.ui diff --git a/data/mozo.desktop.in.in b/data/mozo.desktop.in.in index 44318fe..c5e6bb6 100644 --- a/data/mozo.desktop.in.in +++ b/data/mozo.desktop.in.in @@ -1,6 +1,6 @@ [Desktop Entry] -_Name=Main Menu -_Comment=Change which applications are shown on the main menu +Name=Main Menu +Comment=Change which applications are shown on the main menu Exec=mozo Terminal=false Type=Application diff --git a/po/Makevars b/po/Makevars new file mode 100644 index 0000000..193ed9e --- /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_ --add-comments + +# 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 5de7ab1..18c60bd 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,5 +1,4 @@ -[encoding: UTF-8] Mozo/MainWindow.py Mozo/MenuEditor.py data/mozo.desktop.in.in -[type: gettext/glade]data/mozo.ui +data/mozo.ui |