From 737d29864b5eef571a9843eec88238c3b8b33175 Mon Sep 17 00:00:00 2001
From: Ansa89 <ansalonistefano@gmail.com>
Date: Mon, 25 May 2015 16:38:52 +0200
Subject: [PATCH] Add localization system (gettext)

---
 src/chat.c                       |   3 ++-
 translations/en.mo               | Bin 28476 -> 28644 bytes
 translations/en.po               |  25 +++++++++++--------------
 translations/it.po               |   7 ++++++-
 translations/tools/create_po.sh  |   7 ++++---
 translations/tools/update_pot.sh |  10 +++++++++-
 translations/toxic.pot           |   8 ++++----
 7 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/src/chat.c b/src/chat.c
index 6a6b45a..4567a0d 100644
--- a/src/chat.c
+++ b/src/chat.c
@@ -596,7 +596,8 @@ void chat_onStarting (ToxWindow *self, ToxAV *av, uint32_t friend_number, int st
     self->is_call = true;
 
     init_infobox(self);
-    line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Call started! Type: \"/hangup\" to end it.");
+
+    line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, gettext("Call started! Type: \"%s\" to end it."), "/hangup");
 
 #ifdef SOUND_NOTIFY
     stop_sound(self->ringing_sound);
diff --git a/translations/en.mo b/translations/en.mo
index 568b7c36e9ce8476974e819892c4bcf7bf981402..6079848c20d044e3fe11495bd258059afc346da0 100644
GIT binary patch
delta 7861
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
RzD1R78Ey9dzvJ!q`ya5OUk3mH

delta 7748
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
CWkXE>

diff --git a/translations/en.po b/translations/en.po
index d30b394..e9dc748 100644
--- a/translations/en.po
+++ b/translations/en.po
@@ -1,10 +1,14 @@
+# English translations for Toxic package.
+# Copyright (C) 2015 Toxic Team
+# This file is distributed under the same license as the Toxic package.
+# Automatically generated, 2015.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Toxic 0.6.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-28 15:47+0200\n"
-"PO-Revision-Date: 2015-05-26 11:37+0200\n"
+"Report-Msgid-Bugs-To: JFreegman@tox.im\n"
+"POT-Creation-Date: 2015-05-30 11:30+0200\n"
+"PO-Revision-Date: 2015-05-30 11:30+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -695,14 +699,9 @@ msgid "No pending friend request with that ID."
 msgstr "No pending friend request with that ID."
 
 #: ../src/global_commands.c:75
-#, fuzzy, c-format
-#| msgid ""
-#| "Failed to add friend (error %d\n"
-#| ")"
+#, c-format
 msgid "Failed to add friend (error %d)\n"
-msgstr ""
-"Failed to add friend (error %d\n"
-")"
+msgstr "Failed to add friend (error %d)\n"
 
 #: ../src/global_commands.c:78
 msgid "Friend request accepted."
@@ -1585,13 +1584,11 @@ msgstr "WARNING: Failed to save to data file"
 
 #: ../src/toxic.h:43
 msgid "Anonymous"
-msgstr ""
+msgstr "Anonymous"
 
 #: ../src/toxic.h:44
-#, fuzzy
-#| msgid "Toxic User"
 msgid "Tox User"
-msgstr "Toxic User"
+msgstr "Tox User"
 
 #: ../src/windows.c:368
 msgid "failed in set_next_window"
diff --git a/translations/it.po b/translations/it.po
index 57f305e..e8ff5a2 100644
--- a/translations/it.po
+++ b/translations/it.po
@@ -1,7 +1,12 @@
+# Italian translations for Toxic package.
+# Copyright (C) 2015 Toxic Team
+# This file is distributed under the same license as the Toxic package.
+# Automatically generated, 2015.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: Toxic 0.6.0\n"
-"Report-Msgid-Bugs-To: \n"
+"Report-Msgid-Bugs-To: JFreegman@tox.im\n"
 "POT-Creation-Date: 2015-05-28 15:47+0200\n"
 "PO-Revision-Date: 2015-05-26 11:37+0200\n"
 "Last-Translator: Automatically generated\n"
diff --git a/translations/tools/create_po.sh b/translations/tools/create_po.sh
index 05b8747..6a884a6 100755
--- a/translations/tools/create_po.sh
+++ b/translations/tools/create_po.sh
@@ -15,8 +15,9 @@ if [ -e "$loc.po" ]; then
    echo "The translation file must not exist"
    exit 1
 else
-   msginit --no-translator -l $loc -o $loc.po -i toxic.pot
    v=$(grep TOXIC_VERSION ../cfg/global_vars.mk | head -1 | cut -d "=" -f 2 | tr -d " ")
-   sed -e '1,5{/^#/d;}' $loc.po > $loc.po.tmp && mv $loc.po.tmp $loc.po
-   sed -e 's/.*Project-Id-Version:.*/"Project-Id-Version: Toxic '"$v"'\\n"/' $loc.po > $loc.po.tmp && mv $loc.po.tmp $loc.po
+   echo "PACKAGE_NAME=Toxic" > configure
+   echo "PACKAGE_VERSION=$v" >> configure
+   msginit --no-translator -l $loc -o $loc.po -i toxic.pot
+   rm -f configure
 fi
diff --git a/translations/tools/update_pot.sh b/translations/tools/update_pot.sh
index c9acc2b..e182ea9 100755
--- a/translations/tools/update_pot.sh
+++ b/translations/tools/update_pot.sh
@@ -1,4 +1,12 @@
 #!/bin/bash
 
 cd $(dirname $0)/..
-xgettext -d toxic -o toxic.pot ../src/*
+v=$(grep TOXIC_VERSION ../cfg/global_vars.mk | head -1 | cut -d "=" -f 2 | tr -d " ")
+xgettext --default-domain="toxic" \
+	--from-code="UTF-8" \
+	--copyright-holder="Toxic Team" \
+	--msgid-bugs-address="JFreegman@tox.im" \
+	--package-name="Toxic" \
+	--package-version="$v" \
+	--output="toxic.pot" \
+	../src/*
diff --git a/translations/toxic.pot b/translations/toxic.pot
index f7fa00d..278d575 100644
--- a/translations/toxic.pot
+++ b/translations/toxic.pot
@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# Copyright (C) YEAR Toxic Team
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-28 15:47+0200\n"
+"Project-Id-Version: Toxic 0.6.0\n"
+"Report-Msgid-Bugs-To: JFreegman@tox.im\n"
+"POT-Creation-Date: 2015-05-30 11:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"