brusselopole / Worldopole

core/process/locales.loader.php

Braces +6 added lines, -3 removed lines

@@ -19,7 +19,8 @@ 
  *
  * @return array Sorted list of "accept" options
  */
-$sortAccept = function ($header) {
+$sortAccept = function ($header)
+{
 	$matches = array();
 	foreach (explode(',', $header) as $option) {
 		$option = array_map('trim', explode(';', $option));
@@ -52,7 +53,8 @@ 
  *
  * @return string|NULL a matched option, or NULL if no match
  */
-$matchAccept = function ($header, $supported) use ($sortAccept) {
+$matchAccept = function ($header, $supported) use ($sortAccept)
+{
 	$matches = $sortAccept($header);
 	foreach ($matches as $key => $q) {
 		if (isset($supported[$key])) {
@@ -83,7 +85,8 @@ 
  *
  * @return string The negotiated language result or the supplied default.
  */
-$negotiateLanguage = function ($supported, $default = 'en-US') use ($matchAccept) {
+$negotiateLanguage = function ($supported, $default = 'en-US') use ($matchAccept)
+{
 	$supp = array();
 	foreach ($supported as $lang => $isSupported) {
 		if ($isSupported) {

Spacing +17 added lines, -17 removed lines

@@ -19,7 +19,7 @@ 
  *
  * @return array Sorted list of "accept" options
  */
-$sortAccept = function ($header) {
+$sortAccept = function($header) {
 	$matches = array();
 	foreach (explode(',', $header) as $option) {
 		$option = array_map('trim', explode(';', $option));
@@ -52,7 +52,7 @@ 
  *
  * @return string|NULL a matched option, or NULL if no match
  */
-$matchAccept = function ($header, $supported) use ($sortAccept) {
+$matchAccept = function($header, $supported) use ($sortAccept) {
 	$matches = $sortAccept($header);
 	foreach ($matches as $key => $q) {
 		if (isset($supported[$key])) {
@@ -83,7 +83,7 @@ 
  *
  * @return string The negotiated language result or the supplied default.
  */
-$negotiateLanguage = function ($supported, $default = 'en-US') use ($matchAccept) {
+$negotiateLanguage = function($supported, $default = 'en-US') use ($matchAccept) {
 	$supp = array();
 	foreach ($supported as $lang => $isSupported) {
 		if ($isSupported) {
@@ -162,27 +162,27 @@ 
 // Merge the pokedex, pokemon translation and rarity file into a new array 
 ##########################################################################
 
-$pokedex_file 	= file_get_contents(SYS_PATH.'/core/json/pokedex.json');
-$pokemons 		= json_decode($pokedex_file);
+$pokedex_file = file_get_contents(SYS_PATH.'/core/json/pokedex.json');
+$pokemons = json_decode($pokedex_file);
 
 $pokedex_rarity_file = SYS_PATH.'/core/json/pokedex.rarity.json';
 // initial create of pokedex.rarity.json if it doesn't exist
 if (!is_file($pokedex_rarity_file)) {
 	include_once(SYS_PATH.'/core/cron/pokedex.rarity.php');
 }
-$pokedex_rarity_file_content 	= file_get_contents($pokedex_rarity_file);
-$pokemons_rarity 				= json_decode($pokedex_rarity_file_content);
+$pokedex_rarity_file_content = file_get_contents($pokedex_rarity_file);
+$pokemons_rarity = json_decode($pokedex_rarity_file_content);
 
 foreach ($pokemons->pokemon as $pokeid => $pokemon) {
 	// Merge name and description from translation files
-	$pokemon->name 			= $pokemon_trans->pokemon->$pokeid->name;
-	$pokemon->description 	= $pokemon_trans->pokemon->$pokeid->description;
+	$pokemon->name = $pokemon_trans->pokemon->$pokeid->name;
+	$pokemon->description = $pokemon_trans->pokemon->$pokeid->description;
 
 	// Replace quick and charge move with translation
-	$quick_move 			= $pokemon->quick_move;
-	$pokemon->quick_move 	= $pokemon_trans->quick_moves->$quick_move;
-	$charge_move 			= $pokemon->charge_move;
-	$pokemon->charge_move 	= $pokemon_trans->charge_moves->$charge_move;
+	$quick_move = $pokemon->quick_move;
+	$pokemon->quick_move = $pokemon_trans->quick_moves->$quick_move;
+	$charge_move = $pokemon->charge_move;
+	$pokemon->charge_move = $pokemon_trans->charge_moves->$charge_move;
 
 	// Replace types with translation
 	foreach ($pokemon->types as &$type) {
@@ -192,8 +192,8 @@ 
 
 	// Resolve candy_id to candy_name
 	if (isset($pokemon->candy_id)) {
-		$candy_id 				= $pokemon->candy_id;
-		$pokemon->candy_name 	= $pokemon_trans->pokemon->$candy_id->name;
+		$candy_id = $pokemon->candy_id;
+		$pokemon->candy_name = $pokemon_trans->pokemon->$candy_id->name;
 		unset($pokemon->candy_id);
 	}
 	// Convert move numbers to names
@@ -229,8 +229,8 @@ 
 // Translate typecolors array keys as well
 $types_temp = new stdClass();
 foreach ($pokemons->typecolors as $type => $color) {
-	$type_trans 				= $pokemon_trans->types->$type;
-	$types_temp->$type_trans 	= $color;
+	$type_trans = $pokemon_trans->types->$type;
+	$types_temp->$type_trans = $color;
 }
 // Replace typecolors array with translated one
 $pokemons->typecolors = $types_temp;