Improved language ID validation

aimeos · Apr 12, 2017 · 657c47a · 657c47a
1 parent 5cebd05
commit 657c47a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/lib/mshoplib/src/MShop/Common/Item/Base.php b/lib/mshoplib/src/MShop/Common/Item/Base.php
@@ -307,11 +307,18 @@ protected function checkLanguageId( $langid, $null = true )
 
 		if( $langid != null )
 		{
-			if( preg_match( '/^[a-z]{2}(_[A-Z]{2})?$/', $langid ) !== 1 ) {
+			if( preg_match( '/^[a-zA-Z]{2}(_[a-zA-Z]{2})?$/', $langid ) !== 1 ) {
 				throw new \Aimeos\MShop\Exception( sprintf( 'Invalid ISO language code "%1$s"', $langid ) );
 			}
 
-			return $langid;
+			$parts = explode( '_', $langid );
+			$parts[0] = strtolower( $parts[0] );
+
+			if( isset( $parts[1] ) ) {
+				$parts[1] = strtoupper( $parts[1] );
+			}
+
+			return implode( '_', $parts );
 		}
 	}
 

diff --git a/lib/mshoplib/tests/MShop/Locale/Item/StandardTest.php b/lib/mshoplib/tests/MShop/Locale/Item/StandardTest.php
@@ -141,13 +141,6 @@ public function testSetLanguageIdCountryInvalid()
 	}
 
 
-	public function testSetLanguageIdCountryInvalidLowerCase()
-	{
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
-		$this->object->setLanguageId( 'en_gb' );
-	}
-
-
 	public function testGetCurrencyId()
 	{
 		$this->assertEquals( 'EUR', $this->object->getCurrencyId() );

diff --git a/lib/mshoplib/tests/MShop/Media/Item/StandardTest.php b/lib/mshoplib/tests/MShop/Media/Item/StandardTest.php
@@ -145,7 +145,7 @@ public function testSetLanguageId()
 	public function testSetLanguageIdInvalid()
 	{
 		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
-		$this->object->setLanguageId( 'EN' );
+		$this->object->setLanguageId( '00' );
 	}