[v2] po: Update translations

Message ID 20210414120234.2761-1-valter.jansons@gmail.com
State Superseded
Headers show
Series
  • [v2] po: Update translations
Related show

Commit Message

Valters Jansons April 14, 2021, 12:02 p.m. UTC
The POTFILES.in is regenerated based on a fresh checkout of the
repository. As the src/python/__init__.py file is not present in
the tree, it's being removed from POTFILES.in.

Signed-off-by: Valters Jansons <valter.jansons@gmail.com>
---
 po/POTFILES.in | 3 +--
 po/de.po       | 5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

Comments

Michael Tremer April 14, 2021, 3:20 p.m. UTC | #1
Hello Valters,

We have a command that automatically generates this file which would not respect this change:

  make update-po

Do you have a way to modify the find/grep construction so that it won’t include any files when a “.in” file is available. Maybe .gitignore is useful here, too?

-Michael

> On 14 Apr 2021, at 13:02, Valters Jansons <valter.jansons@gmail.com> wrote:
> 
> The POTFILES.in is regenerated based on a fresh checkout of the
> repository. As the src/python/__init__.py file is not present in
> the tree, it's being removed from POTFILES.in.
> 
> Signed-off-by: Valters Jansons <valter.jansons@gmail.com>
> ---
> po/POTFILES.in | 3 +--
> po/de.po       | 5 ++---
> 2 files changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/po/POTFILES.in b/po/POTFILES.in
> index 9088986..5d2cc46 100644
> --- a/po/POTFILES.in
> +++ b/po/POTFILES.in
> @@ -1,11 +1,10 @@
> src/libloc.pc.in
> +src/python/__init__.py.in
> src/python/database.py
> src/python/downloader.py
> src/python/export.py
> src/python/i18n.py
> src/python/importer.py
> -src/python/__init__.py
> -src/python/__init__.py.in
> src/python/location-importer.in
> src/python/location.in
> src/python/logger.py
> diff --git a/po/de.po b/po/de.po
> index c35f348..7083958 100644
> --- a/po/de.po
> +++ b/po/de.po
> @@ -7,7 +7,7 @@ msgid ""
> msgstr ""
> "Project-Id-Version: libloc 0\n"
> "Report-Msgid-Bugs-To: \n"
> -"POT-Creation-Date: 2020-08-04 15:44+0000\n"
> +"POT-Creation-Date: 2021-04-14 12:00+0000\n"
> "PO-Revision-Date: 2018-02-01 14:05+0000\n"
> "Last-Translator: Michael Tremer <michael.tremer@ipfire.org>\n"
> "Language-Team: German\n"
> @@ -217,8 +217,7 @@ msgstr ""
> msgid "AS%(asn)s belongs to %(name)s"
> msgstr ""
> 
> -#, python-format
> -msgid "The datase has recently be updated recently (%s)"
> +msgid "The database has been updated recently"
> msgstr ""
> 
> msgid "You must at least pass one flag"
> -- 
> 2.31.1
>
Valters Jansons April 14, 2021, 3:51 p.m. UTC | #2
On Wed, Apr 14, 2021 at 6:20 PM Michael Tremer
<michael.tremer@ipfire.org> wrote:
> We have a command that automatically generates this file which would not respect this change:
>
>   make update-po

$ git clone git://git.ipfire.org/location/libloc.git
$ cd libloc
$ autoreconf --install --symlink
$ intltoolize --force --automake
$ ./configure --prefix=/usr --sysconfdir=/etc --libdir=/lib
$ rm po/POTFILES.in && make po/POTFILES.in
$ make update-po

For me this appears to produce the exact diff that has been provided
in the v2 patch.

> Do you have a way to modify the find/grep construction so that it won’t include any files when a “.in” file is available. Maybe .gitignore is useful here, too?

Which target in which Makefile do you believe needs further modifications?

I really feel like I am missing something here.

--Valters
Michael Tremer April 15, 2021, 10:58 a.m. UTC | #3
Hello,

> On 14 Apr 2021, at 16:51, Valters Jansons <valter.jansons@gmail.com> wrote:
> 
> On Wed, Apr 14, 2021 at 6:20 PM Michael Tremer
> <michael.tremer@ipfire.org> wrote:
>> We have a command that automatically generates this file which would not respect this change:
>> 
>>  make update-po
> 
> $ git clone git://git.ipfire.org/location/libloc.git
> $ cd libloc
> $ autoreconf --install --symlink
> $ intltoolize --force --automake
> $ ./configure --prefix=/usr --sysconfdir=/etc --libdir=/lib
> $ rm po/POTFILES.in && make po/POTFILES.in
> $ make update-po
> 
> For me this appears to produce the exact diff that has been provided
> in the v2 patch.

After running those commands I see the following diff which almost entirely reverts all changes in your patch:

root@michael:/build/libloc# git diff
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5d2cc46..9088986 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,10 +1,11 @@
 src/libloc.pc.in
-src/python/__init__.py.in
 src/python/database.py
 src/python/downloader.py
 src/python/export.py
 src/python/i18n.py
 src/python/importer.py
+src/python/__init__.py
+src/python/__init__.py.in
 src/python/location-importer.in
 src/python/location.in
 src/python/logger.py
diff --git a/po/de.po b/po/de.po
index 7083958..042e52a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libloc 0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-14 12:00+0000\n"
+"POT-Creation-Date: 2021-04-14 10:04+0000\n"
 "PO-Revision-Date: 2018-02-01 14:05+0000\n"
 "Last-Translator: Michael Tremer <michael.tremer@ipfire.org>\n"
 "Language-Team: German\n"

>> Do you have a way to modify the find/grep construction so that it won’t include any files when a “.in” file is available. Maybe .gitignore is useful here, too?
> 
> Which target in which Makefile do you believe needs further modifications?
> 
> I really feel like I am missing something here.

What we would need is to have the command that generates POTFILES.in a mechanism that reads .gitignore and filters out what we do not want (in this case __init__.py).

Does that sound like it makes sense?

  https://git.ipfire.org/?p=location/libloc.git;a=blob;f=Makefile.am;h=e8ee791d57366088e9bcf9919e5eb8db4980f39d;hb=HEAD#l81

-Michael

> 
> --Valters
Valters Jansons April 15, 2021, 11:52 a.m. UTC | #4
On Thu, Apr 15, 2021 at 1:58 PM Michael Tremer
<michael.tremer@ipfire.org> wrote:
> After running those commands I see the following diff which almost entirely reverts all changes in your patch:

Strange -- I wonder where the .py file comes from for you.

> What we would need is to have the command that generates POTFILES.in a mechanism that reads .gitignore and filters out what we do not want (in this case __init__.py).
>
> Does that sound like it makes sense?

Yes. I sent in a v3 patch which uses git-check-ignore for this
purpose. I would really like to avoid working with the .gitignore
files directly for the sake of avoiding complex loops with the various
.gitignore files that could live in all kinds of subdirectories, along
with managing exclusions that are valid in .gitignore.

--Valters

Patch

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9088986..5d2cc46 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,11 +1,10 @@ 
 src/libloc.pc.in
+src/python/__init__.py.in
 src/python/database.py
 src/python/downloader.py
 src/python/export.py
 src/python/i18n.py
 src/python/importer.py
-src/python/__init__.py
-src/python/__init__.py.in
 src/python/location-importer.in
 src/python/location.in
 src/python/logger.py
diff --git a/po/de.po b/po/de.po
index c35f348..7083958 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@  msgid ""
 msgstr ""
 "Project-Id-Version: libloc 0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-04 15:44+0000\n"
+"POT-Creation-Date: 2021-04-14 12:00+0000\n"
 "PO-Revision-Date: 2018-02-01 14:05+0000\n"
 "Last-Translator: Michael Tremer <michael.tremer@ipfire.org>\n"
 "Language-Team: German\n"
@@ -217,8 +217,7 @@  msgstr ""
 msgid "AS%(asn)s belongs to %(name)s"
 msgstr ""
 
-#, python-format
-msgid "The datase has recently be updated recently (%s)"
+msgid "The database has been updated recently"
 msgstr ""
 
 msgid "You must at least pass one flag"