Merge pull request #4711 from rabuzarus/20180329_-_cropperjs

[friendica.git] / util / make_credits.py

diff --git a/util/make_credits.py b/util/make_credits.py
index fb4a909b77d459baa583ec9ebcb2bf10025ba759..fb13322b1371e605abb20ec38ec3509a5172b558 100755 (executable)
--- a/util/make_credits.py
+++ b/util/make_credits.py
@@ -9,7 +9,7 @@ The collected names will be saved in /util/credits.txt which is also parsed from
 yourfriendica.tld/credits.
 
 The output is not perfect, so remember to open a fresh (re)created credits.txt file
-in your fav editor to check for obvious mistakes.
+in your fav editor to check for obvious mistakes and doubled entries.
 
 Initially written by Tobias Diekershoff for the Friendica Project. Released under
 the terms of the AGPL version 3 or later, same as Friendica.
@@ -23,7 +23,7 @@ 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']
+               'Michal Supler', 'michal_s', 'Manuel Pérez', 'rabuzarus', 'Alberto Díaz']
 
 
 #  this script is in the /util sub-directory of the friendica installation
@@ -32,7 +32,7 @@ dontinclude = ['root', 'friendica', 'bavatar', 'tony baldwin', 'Taek', 'silke m'
 path = os.path.abspath(argv[0].split('util/make_credits.py')[0])
 print('> base directory is assumed to be: '+path)
 #  a place to store contributors
-contributors = ['Andi Stadler']
+contributors = ["Andi Stadler", "Ratten", "Vít Šesták 'v6ak'"]
 #  get the contributors
 print('> getting contributors to the friendica core repository')
 p = subprocess.Popen(['git', 'shortlog', '--no-merges', '-s'],
@@ -46,17 +46,20 @@ for i in c:
 n1 = len(contributors)
 print('  > found %d contributors' % n1)
 #  get the contributors to the addons
-os.chdir(path+'/addon')
-#  get the contributors
-print('> getting contributors to the addons')
-p = subprocess.Popen(['git', 'shortlog', '--no-merges', '-s'],
-                         stdout=subprocess.PIPE,
-                         stderr=subprocess.STDOUT)
-c = iter(p.stdout.readline, b'')
-for i in c:
-    name = i.decode().split('\t')[1].split('\n')[0]
-    if not name in contributors and name not in dontinclude:
-        contributors.append(name)
+try:
+    os.chdir(path+'/addon')
+    #  get the contributors
+    print('> getting contributors to the addons')
+    p = subprocess.Popen(['git', 'shortlog', '--no-merges', '-s'],
+                             stdout=subprocess.PIPE,
+                             stderr=subprocess.STDOUT)
+    c = iter(p.stdout.readline, b'')
+    for i in c:
+        name = i.decode().split('\t')[1].split('\n')[0]
+        if not name in contributors and name not in dontinclude:
+            contributors.append(name)
+except FileNotFoundError:
+    print('  > no addon directory found ( THE LIST OF CONTRIBUTORS WILL BE INCOMPLETE )')
 n2 = len(contributors)
 print('  > found %d new contributors' % (n2-n1))
 print('> total of %d contributors to the repositories of friendica' % n2)
@@ -64,7 +67,7 @@ os.chdir(path)
 #  get the translators
 print('> getting translators')
 intrans = False
-for f in glob.glob(path+'/view/*/messages.po'):
+for f in glob.glob(path+'/view/lang/*/messages.po'):
     i = open(f, 'r')
     l = i.readlines()
     i.close()