build: Drop intltool requirement

data/terminator.appdata.xml.in

@@ -4,45 +4,45 @@
  <id>terminator.desktop</id>
  <metadata_license>CC0-1.0</metadata_license>
  <project_license>GPL-2.0-only</project_license>
- <_name>Terminator</_name>
- <_summary>Multiple terminals in one window</_summary>
+ <name>Terminator</name>
+ <summary>Multiple terminals in one window</summary>
  <description>
-  <_p>
+  <p>
    The robot future of terminals
-  </_p>
-  <_p>
+  </p>
+  <p>
    A power-user tool for arranging terminals. It is inspired by programs such as
    gnome-multi-term, quadkonsole, etc. in that the main focus is arranging terminals
    in grids (tabs is the most common default method, which Terminator also supports).
-  </_p>
-  <_p>
+  </p>
+  <p>
    Much of the behavior of Terminator is based on GNOME Terminal, and we are adding
    more features from that as time goes by, but we also want to extend out in different
    directions with useful features for sysadmins and other users.
-  </_p>
-  <_p>Some highlights:</_p>
+  </p>
+  <p>Some highlights:</p>
   <ul>
-   <_li>Arrange terminals in a grid</_li>
-   <_li>Tabs</_li>
-   <_li>Drag and drop re-ordering of terminals</_li>
-   <_li>Lots of keyboard shortcuts</_li>
-   <_li>Save multiple layouts and profiles via GUI preferences editor</_li>
-   <_li>Simultaneous typing to arbitrary groups of terminals</_li>
+   <li>Arrange terminals in a grid</li>
+   <li>Tabs</li>
+   <li>Drag and drop re-ordering of terminals</li>
+   <li>Lots of keyboard shortcuts</li>
+   <li>Save multiple layouts and profiles via GUI preferences editor</li>
+   <li>Simultaneous typing to arbitrary groups of terminals</li>
   </ul>
-  <_p>And lots more...</_p>
+  <p>And lots more...</p>
  </description>
  <screenshots>
   <screenshot type="default">
    <image>https://4.bp.blogspot.com/-xt4Tja1TMQ0/Vdemmf8wYSI/AAAAAAAAA9A/uROTre0PMls/s1600/terminator_main_basic.png</image>
-   <_caption>The main window showing the application in action</_caption>
+   <caption>The main window showing the application in action</caption>
   </screenshot>
   <screenshot>
    <image>https://4.bp.blogspot.com/-rRxALSpEEZw/Vdeu58JgpnI/AAAAAAAAA9o/XewWKJ5HNo4/s1600/terminator_main_complex.png</image>
-   <_caption>Getting a little crazy with the terminals</_caption>
+   <caption>Getting a little crazy with the terminals</caption>
   </screenshot>
   <screenshot>
    <image>https://2.bp.blogspot.com/-t_8oRyMXUls/VdemmRVnZnI/AAAAAAAAA88/rHIr8L1X7Ho/s1600/terminator_prefs_global.png</image>
-   <_caption>The preferences window where you can change the defaults</_caption>
+   <caption>The preferences window where you can change the defaults</caption>
   </screenshot>
  </screenshots>
  <url type="homepage">https://github.com/gnome-terminator/terminator</url>

data/terminator.desktop.in

@@ -1,6 +1,6 @@
 [Desktop Entry]
-_Name=Terminator
-_Comment=Multiple terminals in one window
+Name=Terminator
+Comment=Multiple terminals in one window
 TryExec=terminator
 Exec=terminator
 Icon=terminator

po/LINGUAS

@@ -0,0 +1,82 @@
+af
+ar
+ast
+az
+be
+bg
+bn
+bs
+ca
+ca@valencia
+ckb
+cs
+da
+de
+el
+en_AU
+en_CA
+en_GB
+eo
+es
+et
+eu
+fa
+fi
+fo
+fr
+fy
+ga
+gl
+he
+hi
+hr
+hu
+hy
+ia
+id
+is
+it
+ja
+jv
+ka
+kk
+ko
+ku
+la
+lt
+lv
+mk
+ml
+mr
+ms
+nb
+nl
+nn
+oc
+pl
+pt
+pt_BR
+ro
+ru
+ru_RU
+si
+sk
+sl
+sq
+sr
+su
+sv
+sw
+ta
+te
+th
+tr
+tyv
+ug
+uk
+ur
+vi
+wa
+zh_CN
+zh_HK
+zh_TW

po/POTFILES.in

@@ -1,7 +1,6 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 #
-[encoding: UTF-8]
 remotinator.py
 terminator.py
 data/terminator.desktop.in

po/genpot.sh

@@ -4,7 +4,8 @@ ln -s terminator ../terminator.py
 ln -s remotinator ../remotinator.py
 
 # Make translation files
-intltool-update -g terminator -o terminator.pot -p
+xgettext --default-domain=terminator --files-from=POTFILES.in --from-code=UTF-8 \
+	--directory=..
 
 # Cleanup after stupid workaround
 rm ../terminator.py

setup.py

@@ -69,25 +69,17 @@ def run (self):
     desktop_data='data/terminator.desktop'
     rc = None
     if not self.distribution.without_gettext:
-      rc = os.system ("C_ALL=C " + INTLTOOL_MERGE + " -d -u -c " + TOP_BUILDDIR +
-                 "/po/.intltool-merge-cache " + TOP_BUILDDIR + "/po " +
-                 desktop_in + " " + desktop_data)
+      rc = os.system(f'msgfmt --desktop -d {TOP_BUILDDIR}/po --template {desktop_in} -o {desktop_data}')
     if self.distribution.without_gettext or rc != 0:
-      # run the desktop_in through a command to strip the "_" characters
-      with open(desktop_in) as file_in, open(desktop_data, 'w') as file_data:
-        [file_data.write(line.lstrip('_')) for line in file_in]
+      shutil.copyfile(desktop_in, desktop_data)
 
     appdata_in='data/terminator.appdata.xml.in'
     appdata_data='data/terminator.metainfo.xml'
     rc = None
     if not self.distribution.without_gettext:
-      rc = os.system ("C_ALL=C " + INTLTOOL_MERGE + " -x -u -c " + TOP_BUILDDIR +
-                 "/po/.intltool-merge-cache " + TOP_BUILDDIR + "/po " +
-                 appdata_in + " " + appdata_data)
+      rc = os.system(f'msgfmt --xml -d {TOP_BUILDDIR}/po --template {appdata_in} -o {appdata_data}')
     if self.distribution.without_gettext or rc != 0:
-      # run the appdata_in through a command to strip the "_" characters
-      with open(appdata_in) as file_in, open(appdata_data, 'w') as file_data:
-        [file_data.write(line.replace('<_','<').replace('</_','</')) for line in file_in]
+      shutil.copyfile(appdata_in, appdata_data)
 
 class Uninstall(Command):
   description = "Attempt an uninstall from an install --record file"