From 8b586e9d6cebad0ae89dd67eacfe57cf3195ad13 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Mon, 14 Jan 2019 06:57:37 +0100 Subject: [PATCH 1/3] Updated the CREDITS.TXT file for 2019.01 Additionally Transifex started to add lines to the header that confused the detection of "Translatorname, year" detection so the make_credits script had to be updated. --- CREDITS.txt | 13 +++++++++++++ bin/dev/make_credits.py | 16 +++++++++++----- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/CREDITS.txt b/CREDITS.txt index ff430c927..a2bf7d391 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -1,3 +1,5 @@ + + 23n Abinoam P. Marques Jr. Abrax @@ -21,6 +23,7 @@ Andreas Neustifter Andrej Stieben André Alves André Lohan +Andy Andy H3 Andy Hee AndyHee @@ -49,6 +52,7 @@ Christian M. Grube Christian Vogeley Cohan Robinson Copiis Praeesse +CrystalStiletto Cyboulette Cyryl Sochacki czarnystokrotek @@ -78,6 +82,7 @@ Fabian Dost Fabio Comuni felixgilles Filip Bugaj +Filip H.F. "FiXato" Slagter FlxAlbroscheit foss Francesco Apruzzese @@ -111,6 +116,7 @@ jeroenpraat Johannes Schwab John Brazil Jonatan Nyberg +Jonny Tischbein Josef Moravek juanman julia.domagalska @@ -131,7 +137,9 @@ Magdalena Gazda Mai Anh Nguyen Manuel Pérez Monís Marcin Klessa +Marcin Mikołajczak Marcus Müller +Marie Olive Mariusz Pisz marmor Marquis_de_Carabas @@ -173,6 +181,7 @@ Rabuzarus Radek Rafael Garau Rainulf Pineda +Ralf Thees Ralph Ratten rcmaniac @@ -212,6 +221,7 @@ Thecross Thomas Thomas Willingham thorsten23 +Tim Stahel Tino Tobias Diekershoff Tobias Hößl @@ -229,10 +239,13 @@ ufic Unknown Vasudev Kamath Vasya Novikov +Vinzenz Vietzke vislav +vladimir N VVelox Vít Šesták 'v6ak' Waldemar Stoczkowski +Wouter Broers Yasen Pramatarov ylms Zach Prezkuta diff --git a/bin/dev/make_credits.py b/bin/dev/make_credits.py index e373fa8ca..c74991105 100755 --- a/bin/dev/make_credits.py +++ b/bin/dev/make_credits.py @@ -23,7 +23,9 @@ import os, glob, subprocess # not work in some cases. dontinclude = ['root', 'friendica', 'bavatar', 'tony baldwin', 'Taek', 'silke m', 'leberwurscht', 'abinoam', 'fabrixxm', 'FULL NAME', 'Hauke Zuehl', - 'Michal Supler', 'michal_s', 'Manuel Pérez', 'rabuzarus', 'Alberto Díaz'] + 'Michal Supler', 'michal_s', 'Manuel Pérez', 'rabuzarus', + 'Alberto Díaz', 'hoergen oostende', 'Friendica', 'vinzv', + 'Vincent Vindarel'] # this script is in the /bin/dev directory of the friendica installation @@ -88,10 +90,14 @@ for f in glob.glob(path+'/addon/*/lang/*/messages.po'): for ll in l: if intrans and ll.strip()=='': intrans = False; - if intrans and ll[0]=='#': - name = ll.split('# ')[1].split(',')[0].split(' <')[0] - if not name in contributors and name not in dontinclude: - contributors.append(name) + # at this point Transifex sometimes includes a "#, fuzzy" we eill + # ignore all lines starting with "#," as they do not contains any + # "Name email, year" information. + if not "#," in ll: + if intrans and ll[0]=='#': + name = ll.split('# ')[1].split(',')[0].split(' <')[0] + if not name in contributors and name not in dontinclude: + contributors.append(name) if "# Translators:" in ll: intrans = True # done with the translators From 0c3f123d9ac6068dd719eda1efa044e3db513776 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Mon, 14 Jan 2019 07:02:05 +0100 Subject: [PATCH 2/3] remove empty lines --- CREDITS.txt | 4 +--- bin/dev/make_credits.py | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/CREDITS.txt b/CREDITS.txt index a2bf7d391..61ccf4567 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -1,5 +1,3 @@ - - 23n Abinoam P. Marques Jr. Abrax @@ -256,4 +254,4 @@ zottel Zvi ben Yaakov (a.k.a rdc) Михаил Олексій Замковий -朱陈锬 \ No newline at end of file +朱陈锬 diff --git a/bin/dev/make_credits.py b/bin/dev/make_credits.py index c74991105..d89521390 100755 --- a/bin/dev/make_credits.py +++ b/bin/dev/make_credits.py @@ -24,7 +24,7 @@ import os, glob, subprocess dontinclude = ['root', 'friendica', 'bavatar', 'tony baldwin', 'Taek', 'silke m', 'leberwurscht', 'abinoam', 'fabrixxm', 'FULL NAME', 'Hauke Zuehl', 'Michal Supler', 'michal_s', 'Manuel Pérez', 'rabuzarus', - 'Alberto Díaz', 'hoergen oostende', 'Friendica', 'vinzv', + 'Alberto Díaz', 'hoergen oostende', 'Friendica', 'vinzv', 'Vincent Vindarel'] From ed3a6e3054de64042211bfd2e516198936a09cd0 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Mon, 14 Jan 2019 07:05:49 +0100 Subject: [PATCH 3/3] remouved double entry --- CREDITS.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CREDITS.txt b/CREDITS.txt index 61ccf4567..79f6dc10b 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -22,7 +22,6 @@ Andrej Stieben André Alves André Lohan Andy -Andy H3 Andy Hee AndyHee Angristan