From: Adam Magness <adam.magness@gmail.com>
Date: Tue, 6 Nov 2018 14:48:58 +0000 (-0500)
Subject: Split text.php to L10n
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1d571a527b6bf9584f8dc2ea944ab183707f29e5;p=friendica.git

Split text.php to L10n

move functions from text.php to L10n class
---

diff --git a/include/text.php b/include/text.php
index cfa6c06753..d2e3d0c9f9 100644
--- a/include/text.php
+++ b/include/text.php
@@ -348,65 +348,6 @@ function valid_email($email_address)
 	return preg_match('/^[_a-zA-Z0-9\-\+]+(\.[_a-zA-Z0-9\-\+]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+$/', $email_address);
 }
 
-/**
- * Load poke verbs
- *
- * @return array index is present tense verb
- * 				 value is array containing past tense verb, translation of present, translation of past
- * @hook poke_verbs pokes array
- */
-function get_poke_verbs() {
-
-	// index is present tense verb
-	// value is array containing past tense verb, translation of present, translation of past
-
-	$arr = [
-		'poke' => ['poked', L10n::t('poke'), L10n::t('poked')],
-		'ping' => ['pinged', L10n::t('ping'), L10n::t('pinged')],
-		'prod' => ['prodded', L10n::t('prod'), L10n::t('prodded')],
-		'slap' => ['slapped', L10n::t('slap'), L10n::t('slapped')],
-		'finger' => ['fingered', L10n::t('finger'), L10n::t('fingered')],
-		'rebuff' => ['rebuffed', L10n::t('rebuff'), L10n::t('rebuffed')],
-	];
-	Addon::callHooks('poke_verbs', $arr);
-	return $arr;
-}
-
-/**
- * @brief Translate days and months names.
- *
- * @param string $s String with day or month name.
- * @return string Translated string.
- */
-function day_translate($s) {
-	$ret = str_replace(['Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday'],
-		[L10n::t('Monday'), L10n::t('Tuesday'), L10n::t('Wednesday'), L10n::t('Thursday'), L10n::t('Friday'), L10n::t('Saturday'), L10n::t('Sunday')],
-		$s);
-
-	$ret = str_replace(['January','February','March','April','May','June','July','August','September','October','November','December'],
-		[L10n::t('January'), L10n::t('February'), L10n::t('March'), L10n::t('April'), L10n::t('May'), L10n::t('June'), L10n::t('July'), L10n::t('August'), L10n::t('September'), L10n::t('October'), L10n::t('November'), L10n::t('December')],
-		$ret);
-
-	return $ret;
-}
-
-/**
- * @brief Translate short days and months names.
- *
- * @param string $s String with short day or month name.
- * @return string Translated string.
- */
-function day_short_translate($s) {
-	$ret = str_replace(['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
-		[L10n::t('Mon'), L10n::t('Tue'), L10n::t('Wed'), L10n::t('Thu'), L10n::t('Fri'), L10n::t('Sat'), L10n::t('Sun')],
-		$s);
-	$ret = str_replace(['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov','Dec'],
-		[L10n::t('Jan'), L10n::t('Feb'), L10n::t('Mar'), L10n::t('Apr'), L10n::t('May'), ('Jun'), L10n::t('Jul'), L10n::t('Aug'), L10n::t('Sep'), L10n::t('Oct'), L10n::t('Nov'), L10n::t('Dec')],
-		$ret);
-	return $ret;
-}
-
-
 /**
  * Normalize url
  *
diff --git a/src/Core/L10n.php b/src/Core/L10n.php
index 2efce66ffd..961c870cdd 100644
--- a/src/Core/L10n.php
+++ b/src/Core/L10n.php
@@ -345,4 +345,67 @@ class L10n extends BaseObject
 		}
 		return $langs;
 	}
+
+	/**
+	 * @brief Translate days and months names.
+	 *
+	 * @param string $s String with day or month name.
+	 * @return string Translated string.
+	 */
+	public static function getDay($s)
+	{
+		$ret = str_replace(['Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday'],
+			[self::t('Monday'), self::t('Tuesday'), self::t('Wednesday'), self::t('Thursday'), self::t('Friday'), self::t('Saturday'), self::t('Sunday')],
+			$s);
+
+		$ret = str_replace(['January','February','March','April','May','June','July','August','September','October','November','December'],
+			[self::t('January'), self::t('February'), self::t('March'), self::t('April'), self::t('May'), self::t('June'), self::t('July'), self::t('August'), self::t('September'), self::t('October'), self::t('November'), self::t('December')],
+			$ret);
+
+		return $ret;
+	}
+
+	/**
+	 * @brief Translate short days and months names.
+	 *
+	 * @param string $s String with short day or month name.
+	 * @return string Translated string.
+	 */
+	public static function getDayShort($s)
+	{
+		$ret = str_replace(['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+			[self::t('Mon'), self::t('Tue'), self::t('Wed'), self::t('Thu'), self::t('Fri'), self::t('Sat'), self::t('Sun')],
+			$s);
+
+		$ret = str_replace(['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov','Dec'],
+			[self::t('Jan'), self::t('Feb'), self::t('Mar'), self::t('Apr'), self::t('May'), ('Jun'), self::t('Jul'), self::t('Aug'), self::t('Sep'), self::t('Oct'), self::t('Nov'), self::t('Dec')],
+			$ret);
+
+		return $ret;
+	}
+
+	/**
+	 * Load poke verbs
+	 *
+	 * @return array index is present tense verb
+	 * 				 value is array containing past tense verb, translation of present, translation of past
+	 * @hook poke_verbs pokes array
+	 */
+	public static function getPokeVerbs()
+	{
+		// index is present tense verb
+		// value is array containing past tense verb, translation of present, translation of past
+		$arr = [
+			'poke' => ['poked', self::t('poke'), self::t('poked')],
+			'ping' => ['pinged', self::t('ping'), self::t('pinged')],
+			'prod' => ['prodded', self::t('prod'), self::t('prodded')],
+			'slap' => ['slapped', self::t('slap'), self::t('slapped')],
+			'finger' => ['fingered', self::t('finger'), self::t('fingered')],
+			'rebuff' => ['rebuffed', self::t('rebuff'), self::t('rebuffed')],
+		];
+
+		Addon::callHooks('poke_verbs', $arr);
+
+		return $arr;
+	}
 }