Update to CLDR 33.1

CHANGELOG.md

@@ -1,6 +1,10 @@
 CHANGE LOG
 ==========
 
+## 1.11.0 (2018-09-05)
+ - Update to CLDR-33.1 and latest versions of ISO-15924 and iana-subtag-registry
+ - Adopt PSR-12 code style
+
 ## 1.10.3 (2018-01-15)
  - Use short type names in PHPdoc
 

README.md

@@ -16,7 +16,7 @@ the [Unicode CLDR](http://cldr.unicode.org),
 etc., to help you produce applications that behave nicely for visitors from
 around the world.
 
-Includes definitions for over 750 locales.
+Includes definitions for over 800 locales.
 
 Locales, languages, scripts and territories
 ===========================================

phpunit.xml

@@ -5,6 +5,10 @@
 	beStrictAboutTestSize="true"
 	bootstrap="vendor/autoload.php"
 	colors="true"
+	stopOnError="false"
+	stopOnFailure="false"
+	stopOnIncomplete="false"
+	stopOnSkipped="false"
 	timeoutForSmallTests="10"
 	timeoutForMediumTests="60"
 	timeoutForLargeTests="300"

src/Language/LanguageArs.php

@@ -0,0 +1,23 @@
+<?php namespace Fisharebest\Localization\Language;
+
+use Fisharebest\Localization\PluralRule\PluralRule12;
+use Fisharebest\Localization\Script\ScriptArab;
+use Fisharebest\Localization\Territory\TerritorySa;
+
+/**
+ * Class LanguageAr - Representation of the Najdi Arabic language.
+ *
+ * @author    Greg Roach <fisharebest@gmail.com>
+ * @copyright (c) 2015 Greg Roach
+ * @license   GPLv3+
+ */
+class LanguageArs extends LanguageAr {
+	public function code() {
+		return 'ars';
+	}
+
+	public function defaultTerritory()
+    {
+        return new TerritorySa();
+    }
+}

src/Language/LanguageCcp.php

@@ -0,0 +1,33 @@
+<?php namespace Fisharebest\Localization\Language;
+
+use Fisharebest\Localization\PluralRule\PluralRule0;
+use Fisharebest\Localization\Script\ScriptCakm;
+use Fisharebest\Localization\Territory\TerritoryBd;
+
+/**
+ * Class LanguageCgg - Representation of the Chakma language.
+ *
+ * @TODO Plural rules
+ *
+ * @author    Greg Roach <fisharebest@gmail.com>
+ * @copyright (c) 2018 Greg Roach
+ * @license   GPLv3+
+ */
+class LanguageCcp extends AbstractLanguage implements LanguageInterface {
+	public function code() {
+		return 'ccp';
+	}
+
+	public function defaultTerritory() {
+		return new TerritoryBd;
+	}
+
+    public function defaultScript() {
+        return new ScriptCakm;
+    }
+
+    public function pluralRule()
+    {
+        return new PluralRule0();
+    }
+}

src/Language/LanguageIo.php

@@ -0,0 +1,25 @@
+<?php namespace Fisharebest\Localization\Language;
+
+use Fisharebest\Localization\PluralRule\PluralRule1;
+use Fisharebest\Localization\Territory\Territory001;
+
+/**
+ * Class LanguageIo - Representation of the Ido language.
+ *
+ * @author    Greg Roach <fisharebest@gmail.com>
+ * @copyright (c) 2018 Greg Roach
+ * @license   GPLv3+
+ */
+class LanguageIo extends AbstractLanguage implements LanguageInterface {
+	public function code() {
+		return 'io';
+	}
+
+	public function defaultTerritory() {
+		return new Territory001;
+	}
+
+	public function pluralRule() {
+		return new PluralRule1;
+	}
+}

src/Language/LanguageNds.php

@@ -0,0 +1,25 @@
+<?php namespace Fisharebest\Localization\Language;
+
+use Fisharebest\Localization\PluralRule\PluralRule1;
+use Fisharebest\Localization\Territory\TerritoryDe;
+
+/**
+ * Class LanguageNds - Representation of the Low German language.
+ *
+ * @author    Greg Roach <fisharebest@gmail.com>
+ * @copyright (c) 2018 Greg Roach
+ * @license   GPLv3+
+ */
+class LanguageNds extends AbstractLanguage implements LanguageInterface {
+	public function code() {
+		return 'nds';
+	}
+
+	public function defaultTerritory() {
+		return new TerritoryDe;
+	}
+
+	public function pluralRule() {
+		return new PluralRule1;
+	}
+}

src/Language/LanguageScn.php

@@ -0,0 +1,25 @@
+<?php namespace Fisharebest\Localization\Language;
+
+use Fisharebest\Localization\PluralRule\PluralRule1;
+use Fisharebest\Localization\Territory\TerritoryIt;
+
+/**
+ * Class LanguageScn - Representation of the Sicilian language.
+ *
+ * @author    Greg Roach <fisharebest@gmail.com>
+ * @copyright (c) 2018 Greg Roach
+ * @license   GPLv3+
+ */
+class LanguageScn extends AbstractLanguage implements LanguageInterface {
+	public function code() {
+		return 'scn';
+	}
+
+	public function defaultTerritory() {
+		return new TerritoryIt;
+	}
+
+	public function pluralRule() {
+		return new PluralRule1;
+	}
+}

src/Language/LanguageSd.php

@@ -0,0 +1,31 @@
+<?php namespace Fisharebest\Localization\Language;
+
+use Fisharebest\Localization\PluralRule\PluralRule1;
+use Fisharebest\Localization\Script\ScriptArab;
+use Fisharebest\Localization\Territory\TerritoryPk;
+
+/**
+ * Class LanguageSd - Representation of the Sindhi language.
+ *
+ * @author    Greg Roach <fisharebest@gmail.com>
+ * @copyright (c) 2018 Greg Roach
+ * @license   GPLv3+
+ */
+class LanguageSd extends AbstractLanguage implements LanguageInterface {
+	public function code() {
+		return 'sd';
+	}
+
+	public function defaultScript()
+    {
+        return new ScriptArab();
+    }
+
+    public function defaultTerritory() {
+		return new TerritoryPk;
+	}
+
+	public function pluralRule() {
+		return new PluralRule1;
+	}
+}

src/Language/LanguageTg.php

@@ -0,0 +1,31 @@
+<?php namespace Fisharebest\Localization\Language;
+
+use Fisharebest\Localization\PluralRule\PluralRule1;
+use Fisharebest\Localization\Script\ScriptCyrl;
+use Fisharebest\Localization\Territory\TerritoryTj;
+
+/**
+ * Class LanguageTg - Representation of the Tajik language.
+ *
+ * @author    Greg Roach <fisharebest@gmail.com>
+ * @copyright (c) 2018 Greg Roach
+ * @license   GPLv3+
+ */
+class LanguageTg extends AbstractLanguage implements LanguageInterface {
+	public function code() {
+		return 'tg';
+	}
+
+	public function defaultScript() {
+		return new ScriptCyrl;
+	}
+
+	public function defaultTerritory()
+    {
+        return new TerritoryTj();
+    }
+
+    public function pluralRule() {
+		return new PluralRule1;
+	}
+}

src/Locale/AbstractLocale.php

@@ -1,5 +1,6 @@
 <?php namespace Fisharebest\Localization\Locale;
 
+use Fisharebest\Localization\Language\LanguageInterface;
 use Fisharebest\Localization\PluralRule\PluralRuleInterface;
 use Fisharebest\Localization\Script\ScriptInterface;
 use Fisharebest\Localization\Territory\TerritoryInterface;
@@ -9,7 +10,7 @@
  * Class AbstractLocale - The “root” locale, from which all others are derived.
  *
  * @author    Greg Roach <fisharebest@gmail.com>
- * @copyright (c) 2015 Greg Roach
+ * @copyright (c) 2018 Greg Roach
  * @license   GPLv3+
  */
 abstract class AbstractLocale {
@@ -19,6 +20,7 @@ abstract class AbstractLocale {
 	const NEGATIVE = '-'; // Negative numbers
 
 	// "Target" strings, when translating numbers
+    const ALM          = "\xD8\x9C"; // Arabic Letter Mark
 	const APOSTROPHE   = '’';
 	const ARAB_DECIMAL = "\xD9\xAB";
 	const ARAB_GROUP   = "\xD9\xAC";
@@ -112,7 +114,7 @@ public function direction() {
 		return $this->script()->direction();
 	}
 
-	/**
+    /**
 	 * A sortable version of the locale name.  For example, “British English”
 	 * might sort as “ENGLISH, BRITISH” to keep all the variants of English together.
 	 *
@@ -236,7 +238,7 @@ public function percent($number) {
 	 * @return string
 	 */
 	protected function percentFormat() {
-		return '%s%%';
+		return '%s' . self::PERCENT;
 	}
 
 	/**

src/Locale/LocaleAr.php

@@ -6,7 +6,7 @@
  * Class LocaleAr - Arabic
  *
  * @author        Greg Roach <fisharebest@gmail.com>
- * @copyright (c) 2015 Greg Roach
+ * @copyright (c) 2018 Greg Roach
  * @license       GPLv3+
  */
 class LocaleAr extends AbstractLocale implements LocaleInterface {
@@ -22,11 +22,11 @@ public function numberSymbols() {
 		return array(
 			self::GROUP    => self::ARAB_GROUP,
 			self::DECIMAL  => self::ARAB_DECIMAL,
-			self::NEGATIVE => self::RTL_MARK . self::HYPHEN,
+			self::NEGATIVE => self::ALM . self::HYPHEN,
 		);
 	}
 
 	protected function percentFormat() {
-		return '%s' . self::ARAB_PERCENT;
+		return '%s' . self::ARAB_PERCENT . self::ALM;
 	}
 }

src/Locale/LocaleArDz.php

@@ -1,24 +1,35 @@
 <?php namespace Fisharebest\Localization\Locale;
 
+use Fisharebest\Localization\Script\ScriptLatn;
 use Fisharebest\Localization\Territory\TerritoryDz;
 
 /**
  * Class LocaleArDz
  *
  * @author        Greg Roach <fisharebest@gmail.com>
- * @copyright (c) 2015 Greg Roach
+ * @copyright (c) 2018 Greg Roach
  * @license       GPLv3+
  */
 class LocaleArDz extends LocaleAr {
 	public function numberSymbols() {
 		return array(
 			self::GROUP    => self::DOT,
 			self::DECIMAL  => self::COMMA,
-			self::NEGATIVE => self::LTR_MARK . self::HYPHEN,
+            self::NEGATIVE => self::LTR_MARK . '-',
 		);
 	}
 
-	public function territory() {
+    protected function numerals() {
+        $latin = new ScriptLatn();
+
+        return $latin->numerals();
+    }
+
+    protected function percentFormat() {
+        return '%s' . self::LTR_MARK . self::PERCENT . self::LTR_MARK;
+    }
+
+    public function territory() {
 		return new TerritoryDz;
 	}
 }

src/Locale/LocaleArEh.php

@@ -1,5 +1,6 @@
 <?php namespace Fisharebest\Localization\Locale;
 
+use Fisharebest\Localization\Script\ScriptLatn;
 use Fisharebest\Localization\Territory\TerritoryEh;
 
 /**
@@ -10,15 +11,23 @@
  * @license       GPLv3+
  */
 class LocaleArEh extends LocaleAr {
-	public function numberSymbols() {
-		return array(
-			self::GROUP    => self::COMMA,
-			self::DECIMAL  => self::DOT,
-			self::NEGATIVE => self::LTR_MARK . self::HYPHEN,
-		);
-	}
+    public function numberSymbols() {
+        return array(
+            self::NEGATIVE => self::LTR_MARK . '-',
+        );
+    }
+
+    protected function numerals() {
+        $latin = new ScriptLatn();
+
+        return $latin->numerals();
+    }
+
+    protected function percentFormat() {
+        return '%s' . self::LTR_MARK . self::PERCENT . self::LTR_MARK;
+    }
 
-	public function territory() {
+    public function territory() {
 		return new TerritoryEh;
 	}
 }