Move credits out of util/

diff --git a/CREDITS.txt b/CREDITS.txt
new file mode 100644 (file)
index 0000000..ff430c9
--- /dev/null
+++ b/CREDITS.txt
@@ -0,0 +1,246 @@
+23n
+Abinoam P. Marques Jr.
+Abrax
+Adam Clark
+Adam Jurkiewicz
+Adam Magness
+Aditoo
+Aditoo17
+AgnesElisa
+Albert
+Alberto Díaz Tormo
+Alex
+Alexander Fortin
+Alexander Kampmann
+Alexandre Alapetite
+AlfredSK
+Andi
+Andi Stadler
+Andreas H.
+Andreas Neustifter
+Andrej Stieben
+André Alves
+André Lohan
+Andy H3
+Andy Hee
+AndyHee
+Angristan
+Anthronaut
+Arian - Cazare Muncitori
+Athalbert
+aweiher
+axelt
+balderino
+Beanow
+beardyunixer
+Beatriz Vital
+Beluga
+Ben
+Ben Roberts
+ben-utzer
+bufalo1973
+Calango Jr
+Carlos Solís
+Carsten Pfeiffer
+Cat Gray
+Chris Case
+Christian González
+Christian M. Grube
+Christian Vogeley
+Cohan Robinson
+Copiis Praeesse
+Cyboulette
+Cyryl Sochacki
+czarnystokrotek
+Damien Goutte-Gattat
+Daniel Dupriest
+Daria Początek
+David
+David Martín Miranda
+David Rabel
+Dean Townsley
+Denis Chenu
+Devlon Duthie
+Diego Souza
+Domovoy
+Doru  DEACONU
+Dylan Thiedeke
+Développeur égaré
+eddy2508
+Eelco Maljaars
+effex7
+Elena
+emilia.krawczyk
+Eric Côté
+erik
+Erkan Yilmaz
+Fabian Dost
+Fabio Comuni
+felixgilles
+Filip Bugaj
+FlxAlbroscheit
+foss
+Francesco Apruzzese
+Frank Dieckmann
+Frederico Gonçalves Guimarães
+Gerhard Seeber
+gerhard6380
+Gert Cauwenberg
+GLComo
+greeneyedred
+Gregory Smith
+Haakon Meland Eriksen
+Hans Meine
+hauke
+Hauke
+Hauke Altmann
+Hauke Zühl
+Herbert Thielen
+hoergen
+Hubert Kościański
+Hypolite Petovan
+Ilmari
+ImgBotApp
+irhen
+Jak
+Jakob
+Jens Tautenhahn
+jensp
+Jeroen De Meerleer
+jeroenpraat
+Johannes Schwab
+John Brazil
+Jonatan Nyberg
+Josef Moravek
+juanman
+julia.domagalska
+Karel
+Karolina
+Keith Fernie
+Klaus Weidenbach
+Koyu Berteon
+Kris
+Lea1995polish
+Leberwurscht
+Leonard Lausen
+Lionel Triay
+Lorem Ipsum
+Ludovic Grossard
+maase2
+Magdalena Gazda
+Mai Anh Nguyen
+Manuel Pérez Monís
+Marcin Klessa
+Marcus Müller
+Mariusz Pisz
+marmor
+Marquis_de_Carabas
+Martin Schmitt
+Mateusz Mikos
+Mats Sjöberg
+Matthew Exon
+Matthias
+Matthias Moritz
+Mauro Batini
+Max Weller
+mhnxo
+Michael Johnston
+Michael Vogel
+Michal Šupler
+Michalina
+Mike Macgirvin
+miqrogroove
+mytbk
+Nicola Spanti
+Olaf Conradi
+Oliver
+Olivier
+Olivier Mehani
+Olivier Migeot
+Paolo Wave
+Pascal
+Pascal Deklerck
+Pavel Morozov
+PerigGouanvic
+peturisfeld
+Philipp
+Philipp Holzer
+Pierre Rudloff
+Piotr Blonkowski
+pokerazor
+R C
+Rabuzarus
+Radek
+Rafael Garau
+Rainulf Pineda
+Ralph
+Ratten
+rcmaniac
+rebeka-catalina
+repat
+Ricardo Pereira
+RJ Madsen
+Roland Häder
+Rui Andrada
+RyDroid
+S.Krumbholz
+Sakałoŭ Alaksiej
+Sam
+Samuli Valavuo
+Sandro Santilli
+Sebastian Egbers
+sella
+Sennewood
+Seth
+Silke Meyer
+Simon L'nu
+Simó Albert i Beltran
+soko1
+St John Karp
+Stanislav N.
+Steffen K9
+StefOfficiel
+Sveinn í Felli
+Sven Anders
+Sylvain Lagacé
+szymon.filip
+Sérgio Lima
+Taekus
+Tazman DeVille
+teho
+Thecross
+Thomas
+Thomas Willingham
+thorsten23
+Tino
+Tobias Diekershoff
+Tobias Hößl
+tomacat
+tomamplius
+tomtom84
+Tony Baldwin
+TORminator
+trebor
+tschlotfeldt
+Tubuntu
+Tupambae.org
+U-SOUND\mike
+ufic
+Unknown
+Vasudev Kamath
+Vasya Novikov
+vislav
+VVelox
+Vít Šesták 'v6ak'
+Waldemar Stoczkowski
+Yasen Pramatarov
+ylms
+Zach Prezkuta
+Zane C. Bowers-Hadley
+Zered
+zotlabs
+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 edd34c7515d0094b81a3c900a870956493676d1a..e373fa8caac14364362f16a188395b9b79c82c71 100755 (executable)
--- a/bin/dev/make_credits.py
+++ b/bin/dev/make_credits.py
@@ -5,7 +5,7 @@
 This script will collect the contributors to friendica and its translations from
   * the git log of the friendica core and addons repositories
   * the translated messages.po from core and the addons.
-The collected names will be saved in /util/credits.txt which is also parsed from
+The collected names will be saved in 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
@@ -26,7 +26,7 @@ dontinclude = ['root', 'friendica', 'bavatar', 'tony baldwin', 'Taek', 'silke m'
                'Michal Supler', 'michal_s', 'Manuel Pérez', 'rabuzarus', 'Alberto Díaz']
 
 
-#  this script is in the /util sub-directory of the friendica installation
+#  this script is in the /bin/dev directory of the friendica installation
 #  so the friendica path is the 0th argument of calling this script but we
 #  need to remove the name of the file and the name of the directory
 path = os.path.abspath(argv[0].split('bin/dev/make_credits.py')[0])
@@ -101,7 +101,7 @@ print('  > found %d translators' % (n3-n2))
 print('> found a total of %d contributors and translators' % n3)
 contributors.sort(key=str.lower)
 
-f = open(path+'/util/credits.txt', 'w')
+f = open(path+'/CREDITS.txt', 'w')
 f.write("\n".join(contributors))
 f.close()
-print('> list saved to util/credits.txt')
+print('> list saved to CREDITS.txt')

diff --git a/mod/credits.php b/mod/credits.php
index c53c86b8b9882b3b1913cb2db2ab651a8069d7f1..cfcc30b3e2e3beb7f7879b70803109ca665e9456 100644 (file)
--- a/mod/credits.php
+++ b/mod/credits.php
@@ -12,7 +12,7 @@ use Friendica\Core\Renderer;
 function credits_content()
 {
        /* fill the page with credits */
-       $credits_string = file_get_contents('util/credits.txt');
+       $credits_string = file_get_contents('CREDITS.txt');
        $names = explode("\n", htmlspecialchars($credits_string));
        $tpl = Renderer::getMarkupTemplate('credits.tpl');
        return Renderer::replaceMacros($tpl, [

diff --git a/util/credits.txt b/util/credits.txt
deleted file mode 100644 (file)
index ff430c9..0000000
--- a/util/credits.txt
+++ /dev/null
@@ -1,246 +0,0 @@
-23n
-Abinoam P. Marques Jr.
-Abrax
-Adam Clark
-Adam Jurkiewicz
-Adam Magness
-Aditoo
-Aditoo17
-AgnesElisa
-Albert
-Alberto Díaz Tormo
-Alex
-Alexander Fortin
-Alexander Kampmann
-Alexandre Alapetite
-AlfredSK
-Andi
-Andi Stadler
-Andreas H.
-Andreas Neustifter
-Andrej Stieben
-André Alves
-André Lohan
-Andy H3
-Andy Hee
-AndyHee
-Angristan
-Anthronaut
-Arian - Cazare Muncitori
-Athalbert
-aweiher
-axelt
-balderino
-Beanow
-beardyunixer
-Beatriz Vital
-Beluga
-Ben
-Ben Roberts
-ben-utzer
-bufalo1973
-Calango Jr
-Carlos Solís
-Carsten Pfeiffer
-Cat Gray
-Chris Case
-Christian González
-Christian M. Grube
-Christian Vogeley
-Cohan Robinson
-Copiis Praeesse
-Cyboulette
-Cyryl Sochacki
-czarnystokrotek
-Damien Goutte-Gattat
-Daniel Dupriest
-Daria Początek
-David
-David Martín Miranda
-David Rabel
-Dean Townsley
-Denis Chenu
-Devlon Duthie
-Diego Souza
-Domovoy
-Doru  DEACONU
-Dylan Thiedeke
-Développeur égaré
-eddy2508
-Eelco Maljaars
-effex7
-Elena
-emilia.krawczyk
-Eric Côté
-erik
-Erkan Yilmaz
-Fabian Dost
-Fabio Comuni
-felixgilles
-Filip Bugaj
-FlxAlbroscheit
-foss
-Francesco Apruzzese
-Frank Dieckmann
-Frederico Gonçalves Guimarães
-Gerhard Seeber
-gerhard6380
-Gert Cauwenberg
-GLComo
-greeneyedred
-Gregory Smith
-Haakon Meland Eriksen
-Hans Meine
-hauke
-Hauke
-Hauke Altmann
-Hauke Zühl
-Herbert Thielen
-hoergen
-Hubert Kościański
-Hypolite Petovan
-Ilmari
-ImgBotApp
-irhen
-Jak
-Jakob
-Jens Tautenhahn
-jensp
-Jeroen De Meerleer
-jeroenpraat
-Johannes Schwab
-John Brazil
-Jonatan Nyberg
-Josef Moravek
-juanman
-julia.domagalska
-Karel
-Karolina
-Keith Fernie
-Klaus Weidenbach
-Koyu Berteon
-Kris
-Lea1995polish
-Leberwurscht
-Leonard Lausen
-Lionel Triay
-Lorem Ipsum
-Ludovic Grossard
-maase2
-Magdalena Gazda
-Mai Anh Nguyen
-Manuel Pérez Monís
-Marcin Klessa
-Marcus Müller
-Mariusz Pisz
-marmor
-Marquis_de_Carabas
-Martin Schmitt
-Mateusz Mikos
-Mats Sjöberg
-Matthew Exon
-Matthias
-Matthias Moritz
-Mauro Batini
-Max Weller
-mhnxo
-Michael Johnston
-Michael Vogel
-Michal Šupler
-Michalina
-Mike Macgirvin
-miqrogroove
-mytbk
-Nicola Spanti
-Olaf Conradi
-Oliver
-Olivier
-Olivier Mehani
-Olivier Migeot
-Paolo Wave
-Pascal
-Pascal Deklerck
-Pavel Morozov
-PerigGouanvic
-peturisfeld
-Philipp
-Philipp Holzer
-Pierre Rudloff
-Piotr Blonkowski
-pokerazor
-R C
-Rabuzarus
-Radek
-Rafael Garau
-Rainulf Pineda
-Ralph
-Ratten
-rcmaniac
-rebeka-catalina
-repat
-Ricardo Pereira
-RJ Madsen
-Roland Häder
-Rui Andrada
-RyDroid
-S.Krumbholz
-Sakałoŭ Alaksiej
-Sam
-Samuli Valavuo
-Sandro Santilli
-Sebastian Egbers
-sella
-Sennewood
-Seth
-Silke Meyer
-Simon L'nu
-Simó Albert i Beltran
-soko1
-St John Karp
-Stanislav N.
-Steffen K9
-StefOfficiel
-Sveinn í Felli
-Sven Anders
-Sylvain Lagacé
-szymon.filip
-Sérgio Lima
-Taekus
-Tazman DeVille
-teho
-Thecross
-Thomas
-Thomas Willingham
-thorsten23
-Tino
-Tobias Diekershoff
-Tobias Hößl
-tomacat
-tomamplius
-tomtom84
-Tony Baldwin
-TORminator
-trebor
-tschlotfeldt
-Tubuntu
-Tupambae.org
-U-SOUND\mike
-ufic
-Unknown
-Vasudev Kamath
-Vasya Novikov
-vislav
-VVelox
-Vít Šesták 'v6ak'
-Waldemar Stoczkowski
-Yasen Pramatarov
-ylms
-Zach Prezkuta
-Zane C. Bowers-Hadley
-Zered
-zotlabs
-zottel
-Zvi ben Yaakov (a.k.a rdc)
-Михаил
-Олексій Замковий
-朱陈锬
\ No newline at end of file