Would the language code (en-GB) make more sense? Just looking at the French strings in that filter.

Yes we could do that - I just went by changing the United Kingdom to UK

Want me to change the PR?

On 4 February 2015 at 16:24, Chris Davenport notifications@github.com
wrote:

Would the language code (en-GB) make more sense? Just looking at the
French strings in that filter.

—
Reply to this email directly or view it on GitHub
#5971 (comment).

Brian Teeman
Co-founder Joomla! and OpenSourceMatters Inc.
http://brian.teeman.net/

lets just make it the same as admin.. English(UK) - site
Bear
On 2/4/2015 10:13, Brian Teeman wrote:

This is a really simple but useful change for improving the UI

In the language overrides there is a filter for selecting site or
administrator language file BUT as the name is so long "English
(United Kingdom) - Administrator" it wraps and means it is not obvious
what the filter is for. See screenshots of both open and closed states

###Before###

egvs
https://cloud.githubusercontent.com/assets/1296369/6044044/ac8b0e08-ac88-11e4-9ba6-111d204db03f.png

p2x1
https://cloud.githubusercontent.com/assets/1296369/6043991/4ab4d952-ac88-11e4-9f41-f30d37a75cd4.png

###After###
after
https://cloud.githubusercontent.com/assets/1296369/6044021/827958e0-ac88-11e4-98af-a1a4a4c6433c.png

ibed
https://cloud.githubusercontent.com/assets/1296369/6043969/255e25f0-ac88-11e4-9d7c-ae6b035c9e60.png

---

    You can view, comment on, or merge this pull request online at:

#5971

    Commit Summary

• Shorten en-GB name

  File Changes
  

• M administrator/language/en-GB/en-GB.xml
  https://github.com/joomla/joomla-cms/pull/5971/files#diff-0 (2)

• M language/en-GB/en-GB.xml
  https://github.com/joomla/joomla-cms/pull/5971/files#diff-1 (2)

  Patch Links:
  

• https://github.com/joomla/joomla-cms/pull/5971.patch

• https://github.com/joomla/joomla-cms/pull/5971.diff

—
Reply to this email directly or view it on GitHub
#5971.

No virus found in this message.
Checked by AVG - www.avg.com http://www.avg.com
Version: 2015.0.5646 / Virus Database: 4281/9056 - Release Date: 02/04/15

Sorry Bear I dont understand you

@chrisdavenport I think you are correct - I will update the PR to show en-GB and fix the Travis errors

I agree, language code is exact and should be used. Less ambiguity and less mistakes would be the result.

OK just needs testing now then - thanks

On 4 February 2015 at 16:43, Chris Davenport notifications@github.com
wrote:

[image: ]

—
Reply to this email directly or view it on GitHub
#5971 (comment).

Brian Teeman
Co-founder Joomla! and OpenSourceMatters Inc.
http://brian.teeman.net/

@brianteeman Travis is failing here:

Time: 1.57 minutes, Memory: 285.50Mb
There were 3 failures:
1) JLanguageTest::testGet
Failed asserting that two strings are equal.
--- Expected
+++ Actual
@@ @@
-'English (United Kingdom)'
+'English (en-GB)'
/home/travis/build/joomla/joomla-cms/tests/unit/suites/libraries/joomla/language/JLanguageTest.php:809
2) JLanguageTest::testGetName
Failed asserting that two strings are equal.
--- Expected
+++ Actual
@@ @@
-'English (United Kingdom)'
+'English (en-GB)'
/home/travis/build/joomla/joomla-cms/tests/unit/suites/libraries/joomla/language/JLanguageTest.php:822
3) JLanguageTest::testGetMetadata
Failed asserting that two arrays are equal.
--- Expected
+++ Actual
@@ @@
 Array (
-    'name' => 'English (United Kingdom)'
+    'name' => 'English (en-GB)'
     'tag' => 'en-GB'
     'rtl' => '0'
     'locale' => 'en_GB.utf8, en_GB.UTF-8, en_G...ingdom'
     'firstDay' => '0'
     'weekEnd' => '0,6'
 )
/home/travis/build/joomla/joomla-cms/tests/unit/suites/libraries/joomla/language/JLanguageTest.php:1021

https://travis-ci.org/joomla/joomla-cms/jobs/49479122

This is because the unit tests are looking for
$this->assertEquals(
'English (United Kingdom)',

I am reluctant to touch the unit tests myself as I dont fully understand
them - so if someone wants to update them on my branch I will merge them
there

On 4 February 2015 at 16:53, zero-24 notifications@github.com wrote:

@brianteeman https://github.com/brianteeman Travis is failing here:

Time: 1.57 minutes, Memory: 285.50Mb
There were 3 failures:
1) JLanguageTest::testGet
Failed asserting that two strings are equal.
--- Expected
+++ Actual
@@ @@
-'English (United Kingdom)'
+'English (en-GB)'
/home/travis/build/joomla/joomla-cms/tests/unit/suites/libraries/joomla/language/JLanguageTest.php:809
2) JLanguageTest::testGetName
Failed asserting that two strings are equal.
--- Expected
+++ Actual
@@ @@
-'English (United Kingdom)'
+'English (en-GB)'
/home/travis/build/joomla/joomla-cms/tests/unit/suites/libraries/joomla/language/JLanguageTest.php:822
3) JLanguageTest::testGetMetadata
Failed asserting that two arrays are equal.
--- Expected
+++ Actual
@@ @@
Array (

• 'name' => 'English (United Kingdom)'
• 'name' => 'English (en-GB)' 'tag' => 'en-GB' 'rtl' => '0' 'locale' => 'en_GB.utf8, en_GB.UTF-8, en_G...ingdom' 'firstDay' => '0' 'weekEnd' => '0,6' ) /home/travis/build/joomla/joomla-cms/tests/unit/suites/libraries/joomla/language/JLanguageTest.php:1021

https://travis-ci.org/joomla/joomla-cms/jobs/49479122

—
Reply to this email directly or view it on GitHub
#5971 (comment).

Brian Teeman
Co-founder Joomla! and OpenSourceMatters Inc.
http://brian.teeman.net/

makes sense. Merging.