Commit e0a47b4f authored by webchick's avatar webchick
Browse files

Issue #2239407 by holly.ross.drupal, YesCT, tstoeckler, alimac: Language...

Issue #2239407 by holly.ross.drupal, YesCT, tstoeckler, alimac: Language manager interface should not specify implementation details for getLanguages on the interface.
parent 4945bae2
...@@ -85,8 +85,7 @@ public function getDefaultLanguage(); ...@@ -85,8 +85,7 @@ public function getDefaultLanguage();
* Language::STATE_LOCKED, Language::STATE_ALL. * Language::STATE_LOCKED, Language::STATE_ALL.
* *
* @return array * @return array
* An associative array of languages, keyed by the language code, ordered * An associative array of languages, keyed by the language code.
* by weight ascending and name ascending.
*/ */
public function getLanguages($flags = Language::STATE_CONFIGURABLE); public function getLanguages($flags = Language::STATE_CONFIGURABLE);
......
...@@ -296,7 +296,7 @@ public function getLanguages($flags = Language::STATE_CONFIGURABLE) { ...@@ -296,7 +296,7 @@ public function getLanguages($flags = Language::STATE_CONFIGURABLE) {
// Add locked languages, they will be filtered later if needed. // Add locked languages, they will be filtered later if needed.
$this->languages += $this->getDefaultLockedLanguages($weight); $this->languages += $this->getDefaultLockedLanguages($weight);
// Sort the language list by weight. // Sort the language list by weight then title.
Language::sort($this->languages); Language::sort($this->languages);
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment