From b7dde386261f8af96558983bd692c2b24a4b48a4 Mon Sep 17 00:00:00 2001
From: friedelwolff <friedelwolff@54714841-351b-0410-a198-e36a94b762f5>
Date: Wed, 02 Dec 2009 22:20:42 +0000
Subject: Normalize the code to the python convention (all non-characters become '_'). Codes with '@' weren't handled correctly.

git-svn-id: https://translate.svn.sourceforge.net/svnroot/translate/src/trunk/translate@13445 54714841-351b-0410-a198-e36a94b762f5
---
diff --git a/translate-toolkit-1.5.1/translate/lang/factory.py b/translate-toolkit-1.5.1/translate/lang/factory.py
index 65da4e2..0066a6a 100644
--- a/translate-toolkit-1.5.1/translate/lang/factory.py
+++ b/translate-toolkit-1.5.1/translate/lang/factory.py
@@ -32,7 +32,7 @@ def getlanguage(code):
     @param code: The ISO 639 language code
     """
     if code:
-        code = code.replace("-", "_")
+        code = code.replace("-", "_").replace("@", "_")
     try:
         try:
             if code is None:
diff --git a/translate-toolkit-1.5.1/translate/lang/test_factory.py b/translate-toolkit-1.5.1/translate/lang/test_factory.py
index f894f59..a0025fe 100644
--- a/translate-toolkit-1.5.1/translate/lang/test_factory.py
+++ b/translate-toolkit-1.5.1/translate/lang/test_factory.py
@@ -27,7 +27,11 @@ def test_getlanguage():
     # Test with None as language code
     language = factory.getlanguage(None)
     assert language.code == ''
-    
+
     #Test with a language code that is a reserved word in Python
     language = factory.getlanguage('is')
     assert language.nplurals == 2
+
+    #Test with a language code contains '@'
+    language = factory.getlanguage('ca@valencia')
+    assert language.nplurals == 2
--
cgit v0.9.1