Fix locale suffix for download URLs

schlessera · schlessera · commit 964b65f98464 · 2019-04-22T15:16:04.000+02:00
diff --git a/src/Core_Command.php b/src/Core_Command.php
@@ -1263,8 +1263,9 @@ private function get_download_url( $version, $locale = 'en_US', $file_type = 'zi
 		}
 
 		$locale_subdomain = 'en_US' === $locale ? '' : substr( $locale, 0, 2 ) . '.';
+		$locale_suffix    = 'en_US' === $locale ? '' : "-{$locale}";
 
-		return "https://{$locale_subdomain}wordpress.org/wordpress-{$version}-{$locale}.{$file_type}";
+		return "https://{$locale_subdomain}wordpress.org/wordpress-{$version}{$locale_suffix}.{$file_type}";
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -1263,8 +1263,9 @@ private function get_download_url( $version, $locale = 'en_US', $file_type = 'zi`
`1263`	`1263`	`}`
`1264`	`1264`
`1265`	`1265`	`$locale_subdomain = 'en_US' === $locale ? '' : substr( $locale, 0, 2 ) . '.';`
	`1266`	`+ $locale_suffix = 'en_US' === $locale ? '' : "-{$locale}";`
`1266`	`1267`
`1267`		`- return "https://{$locale_subdomain}wordpress.org/wordpress-{$version}-{$locale}.{$file_type}";`
	`1268`	`+ return "https://{$locale_subdomain}wordpress.org/wordpress-{$version}{$locale_suffix}.{$file_type}";`
`1268`	`1269`	`}`
`1269`	`1270`
`1270`	`1271`	`/**`