From 4dd5c00ec0c0a732f881990fd5a8be8ee539f995 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 22 Oct 2019 16:25:10 +0200 Subject: [PATCH 1/4] Internationalization --- htdocs/don/class/don.class.php | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php index 70fabfcdc29..9707229393e 100644 --- a/htdocs/don/class/don.class.php +++ b/htdocs/don/class/don.class.php @@ -6,7 +6,7 @@ * Copyright (C) 2015-2017 Alexandre Spangaro * Copyright (C) 2016 Juanjo Menent * Copyright (C) 2019 Thibault FOUCART - * Copyright (C) 2019 Frédéric France + * Copyright (C) 2019 Frédéric France * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -61,8 +61,16 @@ class Don extends CommonObject * @var string String with name of icon for object don. Must be the part after the 'object_' into object_myobject.png */ public $picto = 'generic'; - + + /** + * @var string Date of the donation + */ public $date; + + /** + * amount of donation + * @var double + */ public $amount; /** @@ -133,7 +141,7 @@ class Don extends CommonObject /** - * Retourne le libelle du statut d'un don (brouillon, validee, abandonnee, payee) + * Returns the donation status label (draft, valid, abandoned, paid) * * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long * @return string Libelle @@ -145,7 +153,7 @@ class Don extends CommonObject // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps /** - * Renvoi le libelle d'un statut donne + * Return the label of a given status * * @param int $statut Id statut * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto From c17604437999e8a72bf63e560adc98b3555d29b1 Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Tue, 22 Oct 2019 14:26:26 +0000 Subject: [PATCH 2/4] Fixing style errors. --- htdocs/don/class/don.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php index 9707229393e..fc95009846b 100644 --- a/htdocs/don/class/don.class.php +++ b/htdocs/don/class/don.class.php @@ -61,12 +61,12 @@ class Don extends CommonObject * @var string String with name of icon for object don. Must be the part after the 'object_' into object_myobject.png */ public $picto = 'generic'; - + /** * @var string Date of the donation */ public $date; - + /** * amount of donation * @var double From 9b2905fb434595339d71d2ea1c40269fe1fab258 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 22 Oct 2019 17:10:52 +0200 Subject: [PATCH 3/4] Typo and comment --- htdocs/don/class/donstats.class.php | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/htdocs/don/class/donstats.class.php b/htdocs/don/class/donstats.class.php index dc12f5a1d68..039a85e6c26 100644 --- a/htdocs/don/class/donstats.class.php +++ b/htdocs/don/class/donstats.class.php @@ -19,7 +19,7 @@ */ /** - * \file htdocs/don/class/dontats.class.php + * \file htdocs/don/class/donstats.class.php * \ingroup donations * \brief File of class to manage donations statistics */ @@ -39,11 +39,22 @@ class DonationStats extends Stats */ public $table_element; - public $socid; + public $socid; public $userid; - + + /** + * @var string FROM + */ public $from; + + /** + * @var string field + */ public $field; + + /** + * @var string WHERE + */ public $where; From 5ab6228adbf75168a506ecbc1812cb96c879f568 Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Tue, 22 Oct 2019 15:12:42 +0000 Subject: [PATCH 4/4] Fixing style errors. --- htdocs/don/class/donstats.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/don/class/donstats.class.php b/htdocs/don/class/donstats.class.php index 039a85e6c26..607d6555337 100644 --- a/htdocs/don/class/donstats.class.php +++ b/htdocs/don/class/donstats.class.php @@ -41,17 +41,17 @@ class DonationStats extends Stats public $socid; public $userid; - + /** - * @var string FROM + * @var string FROM */ public $from; - + /** * @var string field */ public $field; - + /** * @var string WHERE */