WIP

lib/Provider/WebProvider.php

@@ -79,6 +79,8 @@ public function provide($key)
 
 		if ($http_code != 200)
 		{
+			echo $url;
+
 			throw new ResourceNotFound($key);
 		}
 
@@ -142,55 +144,63 @@ private function resolve_url($key)
 				$repository = "cldr-dates";
 			}
 
-			return "$repository{$this->prefer}/{$this->version}/main/$locale/ca-$calendar";
+			return "$repository{$this->prefer}/main/$locale/ca-$calendar";
 
 		}, $key);
 
 		$key = preg_replace_callback(self::REGEX_SUPPLEMENTAL, function ($matches) {
 
 			list(, $which) = $matches;
 
-			return "cldr-core/{$this->version}/supplemental/$which";
+			return "cldr-core/supplemental/$which";
 
 		}, $key);
 
 		$key = preg_replace_callback(self::REGEX_NUMBERS_OR_CURRENCIES, function ($matches) {
 
 			list(, $locale, $which) = $matches;
 
-			return "cldr-numbers{$this->prefer}/{$this->version}/main/$locale/$which";
+			return "cldr-numbers{$this->prefer}/main/$locale/$which";
 
 		}, $key);
 
 		$key = preg_replace_callback(self::REGEX_CLDR_MISC, function ($matches) {
 
 			list(, $locale, $which) = $matches;
 
-			return "cldr-misc{$this->prefer}/{$this->version}/main/$locale/$which";
+			return "cldr-misc{$this->prefer}/main/$locale/$which";
 
 		}, $key);
 
 		$key = preg_replace_callback(self::REGEX_CLDR_DATES, function ($matches) {
 
 			list(, $locale, $which) = $matches;
 
-			return "cldr-dates{$this->prefer}/{$this->version}/main/$locale/$which";
+			return "cldr-dates{$this->prefer}/main/$locale/$which";
 
 		}, $key);
 
 		$key = preg_replace_callback(self::REGEX_CLDR_LOCALENAMES, function ($matches) {
 
 			list(, $locale, $which) = $matches;
 
-			return "cldr-localenames{$this->prefer}/{$this->version}/main/$locale/$which";
+			return "cldr-localenames{$this->prefer}/main/$locale/$which";
 
 		}, $key);
 
 		$key = preg_replace_callback(self::REGEX_CLDR_UNITS, function ($matches) {
 
 			list(, $locale, $which) = $matches;
 
-			return "cldr-units{$this->prefer}/{$this->version}/main/$locale/$which";
+			return "cldr-units{$this->prefer}/main/$locale/$which";
+
+		}, $key);
+
+		# insert version
+
+		$key = preg_replace_callback('#^([^/]+)#', function ($matches) {
+
+			return "{$matches[1]}/{$this->version}";
 
 		}, $key);
 

tests/LocalizedCurrencyTest.php

@@ -43,7 +43,7 @@ public function test_get_symbol()
 
 	public function test_localize()
 	{
-		$localized = self::$currency->localize('en-US');
+		$localized = self::$currency->localize('en');
 		$this->assertInstanceOf(LocalizedCurrency::class, $localized);
 		$this->assertEquals("Irish Pound", $localized->name);
 	}