aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab+samsung@kernel.org>2018-08-17 14:38:26 (GMT)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2018-08-18 01:06:11 (GMT)
commit83b679e726068a15d208b0d7083d2c84f5e54c00 (patch)
tree88476143c80b13b5a15dba8bde838a79856bc4b9
parent0cfd83ee81c4bc54debacd134eeb007834f15bf3 (diff)
Convert it to use the new gettext logic
Since version 0.19.8, gettext doesn't need intltoolize anymore. Cleanup gettext logic, in order to auto-generate the po/* files. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
-rw-r--r--Makefile.am4
-rw-r--r--configure.ac12
-rw-r--r--data/Makefile.am1
-rw-r--r--po/Makevars78
-rw-r--r--po/POTFILES.in1
-rw-r--r--src/main.c6
6 files changed, 91 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am
index 772d4cb..e4bc823 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,6 @@
desktopdir = $(datadir)/applications
desktop_in_files = camorama.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-@INTLTOOL_DESKTOP_RULE@
SUBDIRS = src pixmaps data po
@@ -13,7 +12,8 @@ EXTRA_DIST = autogen.sh \
intltool-update.in
CLEANFILES=\
- camorama.desktop
+ camorama.desktop \
+ po/camorama.pot
DISTCLEANFILES=\
intltool-extract\
diff --git a/configure.ac b/configure.ac
index 7988fb3..c033014 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,17 +3,17 @@ AC_INIT(camorama,0.19, https://github.com/alessio/camorama)
AC_CONFIG_SRCDIR(src/main.c)
AM_INIT_AUTOMAKE
AM_CONFIG_HEADER(config.h)
-AC_PROG_INTLTOOL([0.21])
AC_DEFINE(PACKAGE, AC_PACKAGE_NAME, [package name])
AC_DEFINE(VERSION, AC_PACKAGE_VERSION, [package version])
ALL_LINGUAS="am ar az be bg bs ca cs da de dz en_CA en_GB es eu fa fi fr ga gl gu hi hr it ja lv mk ml ms nb ne nl pa pl pt pt_BR rw sl sq sr sr@Latn sv ta tr uk vi zh_CN zh_TW"
-GETTEXT_PACKAGE=AC_PACKAGE_NAME
-AC_SUBST(GETTEXT_PACKAGE)
-AM_GLIB_GNU_GETTEXT
+AM_GNU_GETTEXT_VERSION([0.19.8])
+AM_GNU_GETTEXT([external])
-AC_DEFINE(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", "blah blah blah")
+# This is needed for gtk2+ to work with gettext
+DATADIRNAME=share
+AC_SUBST(DATADIRNAME)
AC_MSG_CHECKING(prefix)
@@ -49,6 +49,8 @@ AC_OUTPUT([
Makefile
src/Makefile
data/Makefile
+ data/camorama.schemas
+ camorama.desktop
pixmaps/Makefile
po/Makefile.in
])
diff --git a/data/Makefile.am b/data/Makefile.am
index ae80c5e..e4e7c17 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -16,7 +16,6 @@ schemadir = @GCONF_SCHEMA_FILE_DIR@
schema_in_files = camorama.schemas.in
schema_DATA = $(schema_in_files:.schemas.in=.schemas)
# schema_DATA = camorama.schemas
-@INTLTOOL_SCHEMAS_RULE@
# For the sake of some users
user-install: $(app_DATA) $(keys_DATA)
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..1f31281
--- /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 = --keyword=_ --keyword=N_
+
+# 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 = Camorama developers
+
+# 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 b473d9d..9161097 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,5 +1,6 @@
# List of source files containing translatable strings.
# Please keep this file sorted alphabetically.
+camorama.appdata.xml
camorama.desktop.in
data/camorama.glade
data/camorama.schemas.in
diff --git a/src/main.c b/src/main.c
index 6e9f175..792bde8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -109,9 +109,9 @@ main(int argc, char *argv[]) {
cam->res = NULL;
cam->n_res = 0;
- bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
- bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
- textdomain (GETTEXT_PACKAGE);
+ bindtextdomain (PACKAGE_NAME, PACKAGE_LOCALE_DIR);
+ bind_textdomain_codeset (PACKAGE_NAME, "UTF-8");
+ textdomain (PACKAGE_NAME);
setlocale (LC_ALL, "");
/* gnome_program_init - initialize everything (gconf, threads, etc) */

Privacy Policy