Skip to content

Commit ad18cef

Browse files
authored
Merge pull request #98 from rtheunissen/ksort-messages
Recursively ksort messages to ensure consistent generated file content
2 parents f9dc36b + a5c129d commit ad18cef

File tree

1 file changed

+18
-0
lines changed

1 file changed

+18
-0
lines changed

src/Mariuzzo/LaravelJsLocalization/Generators/LangJsGenerator.php

+18
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,22 @@ public function generate($target, $options)
8080
return $this->file->put($target, $template);
8181
}
8282

83+
/**
84+
* Recursively sorts all messages by key.
85+
*
86+
* @param array $messages The messages to sort by key.
87+
*/
88+
protected function sortMessages(&$messages)
89+
{
90+
if (is_array($messages)) {
91+
ksort($messages);
92+
93+
foreach ($messages as $key => &$value) {
94+
$this->sortMessages($value);
95+
}
96+
}
97+
}
98+
8399
/**
84100
* Return all language messages.
85101
*
@@ -118,6 +134,8 @@ protected function getMessages()
118134
$messages[$key] = include $path . DIRECTORY_SEPARATOR . $pathName;
119135
}
120136

137+
$this->sortMessages($messages);
138+
121139
return $messages;
122140
}
123141

0 commit comments

Comments
 (0)