Revert "build/i18n: migrate from intltool to gettext (#552)"

clefebvre · clefebvre · commit 3604d80a7dd4 · 2022-11-16T15:52:20.000Z
This reverts commit bbac596. makepot is used during releases by the Mint team only, it doesn't nor shouldn't require any build. This is also overly complicated and tied to the build system. If the only issue is to translate the backend strings, then we can fix that in the UI. I assume it's only used in the open file dialog when changing the formats.
diff --git a/backend/comics/comicsdocument.xreader-backend.in b/backend/comics/comicsdocument.xreader-backend.in
@@ -1,4 +1,4 @@
 [Xreader Backend]
 Module=comicsdocument
-TypeDescription=Comic Books
+_TypeDescription=Comic Books
 MimeType=application/x-cbr;application/x-cbz;application/x-cb7;application/x-cbt;application/vnd.comicbook+zip;
diff --git a/backend/comics/meson.build b/backend/comics/meson.build
@@ -20,12 +20,11 @@ shared_module(
     install_dir: backendsdir,
 )
 
-i18n.merge_file(
-    input: 'comicsdocument.xreader-backend.desktop.in',
+custom_target(
+    'comics_backend',
+    input: 'comicsdocument.xreader-backend.in',
     output: 'comicsdocument.xreader-backend',
-    po_dir: po_dir,
-    type: 'desktop',
-    args: ['--keyword=TypeDescription'],
+    command: [intltool_merge, '-d', '-u', po_dir, '@INPUT@', '@OUTPUT@'],
     install: true,
     install_dir: backendsdir,
 )
diff --git a/backend/djvu/djvudocument.xreader-backend.in b/backend/djvu/djvudocument.xreader-backend.in
@@ -1,4 +1,4 @@
 [Xreader Backend]
 Module=djvudocument
-TypeDescription=DjVu Documents
+_TypeDescription=DjVu Documents
 MimeType=image/vnd.djvu;image/vnd.djvu+multipage
diff --git a/backend/djvu/meson.build b/backend/djvu/meson.build
@@ -26,12 +26,11 @@ shared_module(
     install_dir: backendsdir,
 )
 
-i18n.merge_file(
-    input: 'djvudocument.xreader-backend.desktop.in',
+custom_target(
+    'djvu_backend',
+    input: 'djvudocument.xreader-backend.in',
     output: 'djvudocument.xreader-backend',
-    po_dir: po_dir,
-    type: 'desktop',
-    args: ['--keyword=TypeDescription'],
+    command: [intltool_merge, '-d', '-u', po_dir, '@INPUT@', '@OUTPUT@'],
     install: true,
     install_dir: backendsdir,
 )
diff --git a/backend/dvi/dvidocument.xreader-backend.in b/backend/dvi/dvidocument.xreader-backend.in
@@ -1,4 +1,4 @@
 [Xreader Backend]
 Module=dvidocument
-TypeDescription=DVI Documents
+_TypeDescription=DVI Documents
 MimeType=application/x-dvi;application/x-bzdvi;application/x-gzdvi
diff --git a/backend/dvi/meson.build b/backend/dvi/meson.build
@@ -31,12 +31,11 @@ shared_module(
     install_dir: backendsdir,
 )
 
-i18n.merge_file(
-    input: 'dvidocument.xreader-backend.desktop.in',
+custom_target(
+    'dvi_backend',
+    input: 'dvidocument.xreader-backend.in',
     output: 'dvidocument.xreader-backend',
-    po_dir: po_dir,
-    type: 'desktop',
-    args: ['--keyword=TypeDescription'],
+    command: [intltool_merge, '-d', '-u', po_dir, '@INPUT@', '@OUTPUT@'],
     install: true,
     install_dir: backendsdir,
 )
diff --git a/backend/epub/epubdocument.xreader-backend.in b/backend/epub/epubdocument.xreader-backend.in
@@ -1,4 +1,4 @@
 [Xreader Backend]
 Module=epubdocument
-TypeDescription=epub Documents
+_TypeDescription=epub Documents
 MimeType=application/epub+zip;
diff --git a/backend/epub/meson.build b/backend/epub/meson.build
@@ -25,12 +25,11 @@ shared_module(
     install_dir: backendsdir,
 )
 
-i18n.merge_file(
-    input: 'epubdocument.xreader-backend.desktop.in',
+custom_target(
+    'epub_backend',
+    input: 'epubdocument.xreader-backend.in',
     output: 'epubdocument.xreader-backend',
-    po_dir: po_dir,
-    type: 'desktop',
-    args: ['--keyword=TypeDescription'],
+    command: [intltool_merge, '-d', '-u', po_dir, '@INPUT@', '@OUTPUT@'],
     install: true,
     install_dir: backendsdir,
 )
diff --git a/backend/pdf/meson.build b/backend/pdf/meson.build
@@ -20,12 +20,11 @@ shared_module(
     install_dir: backendsdir,
 )
 
-i18n.merge_file(
-    input: 'pdfdocument.xreader-backend.desktop.in',
+custom_target(
+    'pdf_backend',
+    input: 'pdfdocument.xreader-backend.in',
     output: 'pdfdocument.xreader-backend',
-    po_dir: po_dir,
-    type: 'desktop',
-    args: ['--keyword=TypeDescription'],
+    command: [intltool_merge, '-d', '-u', po_dir, '@INPUT@', '@OUTPUT@'],
     install: true,
     install_dir: backendsdir,
 )
diff --git a/backend/pdf/pdfdocument.xreader-backend.in b/backend/pdf/pdfdocument.xreader-backend.in
@@ -1,5 +1,5 @@
 [Xreader Backend]
 Module=pdfdocument
 Resident=true
-TypeDescription=PDF Documents
+_TypeDescription=PDF Documents
 MimeType=application/pdf;application/x-bzpdf;application/x-gzpdf;application/x-xzpdf;application/x-ext-pdf;
diff --git a/backend/pixbuf/meson.build b/backend/pixbuf/meson.build
@@ -20,12 +20,11 @@ shared_module(
     install_dir: backendsdir,
 )
 
-i18n.merge_file(
-    input: 'pixbufdocument.xreader-backend.desktop.in',
+custom_target(
+    'pixbuf_backend',
+    input: 'pixbufdocument.xreader-backend.in',
     output: 'pixbufdocument.xreader-backend',
-    po_dir: po_dir,
-    type: 'desktop',
-    args: ['--keyword=TypeDescription'],
+    command: [intltool_merge, '-d', '-u', po_dir, '@INPUT@', '@OUTPUT@'],
     install: true,
     install_dir: backendsdir,
 )
diff --git a/backend/pixbuf/pixbufdocument.xreader-backend.in b/backend/pixbuf/pixbufdocument.xreader-backend.in
@@ -1,4 +1,4 @@
 [Xreader Backend]
 Module=pixbufdocument
-TypeDescription=Images
+_TypeDescription=Images
 MimeType=image/*;
diff --git a/backend/ps/meson.build b/backend/ps/meson.build
@@ -21,12 +21,11 @@ shared_module(
     install_dir: backendsdir,
 )
 
-i18n.merge_file(
-    input: 'psdocument.xreader-backend.desktop.in',
+custom_target(
+    'ps_backend',
+    input: 'psdocument.xreader-backend.in',
     output: 'psdocument.xreader-backend',
-    po_dir: po_dir,
-    type: 'desktop',
-    args: ['--keyword=TypeDescription'],
+    command: [intltool_merge, '-d', '-u', po_dir, '@INPUT@', '@OUTPUT@'],
     install: true,
     install_dir: backendsdir,
 )
diff --git a/backend/ps/psdocument.xreader-backend.in b/backend/ps/psdocument.xreader-backend.in
@@ -1,5 +1,5 @@
 [Xreader Backend]
 Module=psdocument
 Resident=true
-TypeDescription=PostScript Documents
+_TypeDescription=PostScript Documents
 MimeType=application/postscript;application/x-bzpostscript;application/x-gzpostscript;image/x-eps;image/x-bzeps;image/x-gzeps
diff --git a/backend/tiff/meson.build b/backend/tiff/meson.build
@@ -24,12 +24,11 @@ shared_module(
     install_dir: backendsdir,
 )
 
-i18n.merge_file(
-    input: 'tiffdocument.xreader-backend.desktop.in',
+custom_target(
+    'tiff_backend',
+    input: 'tiffdocument.xreader-backend.in',
     output: 'tiffdocument.xreader-backend',
-    po_dir: po_dir,
-    type: 'desktop',
-    args: ['--keyword=TypeDescription'],
+    command: [intltool_merge, '-d', '-u', po_dir, '@INPUT@', '@OUTPUT@'],
     install: true,
     install_dir: backendsdir,
 )
diff --git a/backend/tiff/tiffdocument.xreader-backend.in b/backend/tiff/tiffdocument.xreader-backend.in
@@ -1,4 +1,4 @@
 [Xreader Backend]
 Module=tiffdocument
-TypeDescription=Tiff Documents
+_TypeDescription=Tiff Documents
 MimeType=image/tiff
diff --git a/backend/xps/meson.build b/backend/xps/meson.build
@@ -21,12 +21,11 @@ shared_module(
     install_dir: backendsdir,
 )
 
-i18n.merge_file(
-    input: 'xpsdocument.xreader-backend.desktop.in',
+custom_target(
+    'xps_backend',
+    input: 'xpsdocument.xreader-backend.in',
     output: 'xpsdocument.xreader-backend',
-    po_dir: po_dir,
-    type: 'desktop',
-    args: ['--keyword=TypeDescription'],
+    command: [intltool_merge, '-d', '-u', po_dir, '@INPUT@', '@OUTPUT@'],
     install: true,
     install_dir: backendsdir,
 )
diff --git a/backend/xps/xpsdocument.xreader-backend.in b/backend/xps/xpsdocument.xreader-backend.in
@@ -1,5 +1,5 @@
 [Xreader Backend]
 Module=xpsdocument
 Resident=true
-TypeDescription=XPS Documents
+_TypeDescription=XPS Documents
 MimeType=application/oxps;application/vnd.ms-xpsdocument
diff --git a/data/meson.build b/data/meson.build
@@ -31,20 +31,20 @@ desktop = configure_file(
     configuration: desktop_conf,
 )
 
-i18n.merge_file(
+custom_target(
+    'desktop',
     input: desktop,
     output: 'xreader.desktop',
-    po_dir: po_dir,
-    type: 'desktop',
+    command: [intltool_merge, '-d', '-u', po_dir, '@INPUT@', '@OUTPUT@'],
     install: true,
     install_dir: desktopdir,
 )
 
-i18n.merge_file(
+appdata = custom_target(
+    'appdata',
     input: 'xreader.appdata.xml.in',
     output: 'xreader.appdata.xml',
-    po_dir: po_dir,
-    type: 'xml',
+    command: [intltool_merge, '-x', '-u', po_dir, '@INPUT@', '@OUTPUT@'],
     install: true,
     install_dir: join_paths(datadir, 'metainfo'),
 )
diff --git a/data/xreader.appdata.xml.in b/data/xreader.appdata.xml.in
@@ -4,8 +4,8 @@
  <metadata_license>CC0-1.0</metadata_license>
  <project_license>GPL-2.0+</project_license>
  <name>Document Viewer</name>
- <summary>A Document Viewer</summary>
- <description>
+ <_summary>A Document Viewer</_summary>
+ <_description>
   <p>
    Xreader is a simple multi-page document viewer. It can display and
    print PostScript (PS), Encapsulated PostScript (EPS), DJVU, DVI,
@@ -14,7 +14,7 @@
    searching for text, copying text to the clipboard, hypertext navigation
    and table-of-contents bookmarks.
   </p>
- </description>
+ </_description>
  <url type="homepage">http://github.com/linuxmint/xreader</url>
  <project_group>Linux Mint</project_group>
 </component>
diff --git a/data/xreader.desktop.in.in b/data/xreader.desktop.in.in
@@ -1,6 +1,6 @@
 [Desktop Entry]
-Name=Document Viewer
-Comment=View multi-page documents
+_Name=Document Viewer
+_Comment=View multi-page documents
 TryExec=xreader
 Exec=xreader %U
 StartupNotify=true
diff --git a/debian/control b/debian/control
@@ -3,8 +3,8 @@ Section: x11
 Priority: optional
 Maintainer: Linux Mint <root@linuxmint.com>
 Build-Depends: debhelper-compat (= 12),
-               gettext,
                gobject-introspection,
+               intltool,
                libdjvulibre-dev,
                libgail-3-dev,
                libgirepository1.0-dev,
diff --git a/makepot b/makepot
@@ -1,20 +1,4 @@
-#!/usr/bin/sh
+cd po
+INTLTOOL_EXTRACT="/usr/bin/intltool-extract" XGETTEXT="/usr/bin/xgettext" srcdir=. /usr/bin/intltool-update --gettext-package xreader --pot
+mv xreader.pot ..
 
-usage() {
-    echo "Usage: $0 [--help | <meson build dir>]"
-}
-
-if [ $# -ne 1 ] || [ $1 = "--help" ]; then
-    usage
-    exit 1
-fi
-
-if ! [ -d "$1" ]; then
-    echo "meson build dir '$1' does not exist"
-    exit 2
-fi
-
-echo "Generating po/xreader.pot ..."
-ninja -C "$1" xreader-pot || exit 1
-
-echo "Done. To update .po files run:\t ninja -C "$1" xreader-update-po"
diff --git a/meson.build b/meson.build
@@ -121,6 +121,8 @@ xreader_conf.set_quoted('SUPPORTED_MIMETYPES', xreader_mime_types) # This is gen
 # on some systems we need to find the math lib to make sure it builds
 math = cc.find_library('m', required: false)
 
+intltool_merge = find_program('intltool-merge')
+
 mathjax_directory = get_option('mathjax-directory')
 if mathjax_directory == ''
     foreach dir: [
diff --git a/po/POTFILES.in b/po/POTFILES.in
@@ -1,21 +1,19 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
+[encoding: UTF-8]
 backend/comics/comics-document.c
-backend/comics/comicsdocument.xreader-backend.desktop.in
+[type: gettext/ini] backend/comics/comicsdocument.xreader-backend.in
 backend/djvu/djvu-document.c
-backend/djvu/djvudocument.xreader-backend.desktop.in
+[type: gettext/ini] backend/djvu/djvudocument.xreader-backend.in
 backend/dvi/dvi-document.c
-backend/dvi/dvidocument.xreader-backend.desktop.in
+[type: gettext/ini] backend/dvi/dvidocument.xreader-backend.in
 backend/epub/epub-document.c
-backend/epub/epubdocument.xreader-backend.desktop.in
+[type: gettext/ini] backend/epub/epubdocument.xreader-backend.in
 backend/pdf/ev-poppler.cc
-backend/pdf/pdfdocument.xreader-backend.desktop.in
+[type: gettext/ini] backend/pdf/pdfdocument.xreader-backend.in
 backend/ps/ev-spectre.c
-backend/ps/psdocument.xreader-backend.desktop.in
+[type: gettext/ini] backend/ps/psdocument.xreader-backend.in
 backend/tiff/tiff-document.c
-backend/tiff/tiffdocument.xreader-backend.desktop.in
-backend/xps/xps-document.c
-backend/xps/xpsdocument.xreader-backend.desktop.in
 libdocument/ev-attachment.c
 libdocument/ev-document-factory.c
 libdocument/ev-file-helpers.c
@@ -45,7 +43,7 @@ shell/ev-keyring.c
 shell/ev-open-recent-action.c
 shell/ev-password-view.c
 shell/ev-preferences-dialog.c
-shell/ev-preferences-dialog.ui
+[type: gettext/glade]shell/ev-preferences-dialog.ui
 shell/ev-properties-dialog.c
 shell/ev-properties-fonts.c
 shell/ev-properties-license.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
@@ -1,3 +1,4 @@
+data/xreader.desktop.in
 backend/dvi/mdvi-lib/dviread.c
 backend/dvi/mdvi-lib/font.c
 backend/dvi/mdvi-lib/fontmap.c
diff --git a/po/meson.build b/po/meson.build
@@ -1,4 +1,3 @@
 i18n.gettext(meson.project_name(),
-    preset: 'glib',
-    args: ['--keyword=TypeDescription'],
+    preset: 'glib'
 )

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+data/xreader.desktop.in`
`1`	`2`	`backend/dvi/mdvi-lib/dviread.c`
`2`	`3`	`backend/dvi/mdvi-lib/font.c`
`3`	`4`	`backend/dvi/mdvi-lib/fontmap.c`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`	`1`	`i18n.gettext(meson.project_name(),`
`2`		`- preset: 'glib',`
`3`		`- args: ['--keyword=TypeDescription'],`
	`2`	`+ preset: 'glib'`
`4`	`3`	`)`