Simplify findMatchingTransliterator()

ausi · Jul 28, 2017 · 13d342f · 13d342f
1 parent 26f9c0b
commit 13d342f
Showing 1 changed file with 15 additions and 12 deletions.
diff --git a/src/SlugGenerator.php b/src/SlugGenerator.php
@@ -284,20 +284,23 @@ private function findMatchingTransliterator(string $rule, string $locale): \Tran
 	{
 		$rule = $this->fixTransliteratorRule($rule, $locale);
 
-		if ($locale && ($transliterator = \Transliterator::create($locale.'-'.$rule))) {
-			return $transliterator;
+		$candidates = [
+			'Latin-'.$rule,
+			$rule,
+		];
+
+		if ($locale) {
+			array_unshift(
+				$candidates,
+				$locale.'-'.$rule,
+				\Locale::getPrimaryLanguage($locale).'-'.$rule
+			);
 		}
 
-		if ($locale && ($transliterator = \Transliterator::create(\Locale::getPrimaryLanguage($locale).'-'.$rule))) {
-			return $transliterator;
-		}
-
-		if ($transliterator = \Transliterator::create('Latin-'.$rule)) {
-			return $transliterator;
-		}
-
-		if ($transliterator = \Transliterator::create($rule)) {
-			return $transliterator;
+		foreach ($candidates as $candidate) {
+			if ($transliterator = \Transliterator::create($candidate)) {
+				return $transliterator;
+			}
 		}
 
 		if ($transliterator = \Transliterator::createFromRules($rule)) {