unicorn commit: ~ fixed locale name based on richard ishida comments

changeset:   1397:e7f37371fb0d
user:        Thomas Gambet <tgambet@w3.org>
date:        Thu Jul 29 18:15:20 2010 -0400
files:       WebContent/WEB-INF/resources/templates/includes/footer.vm WebContent/WEB-INF/resources/templates/language.vm
description:
~ fixed locale name based on richard ishida comments


diff -r 011fa831225c -r e7f37371fb0d WebContent/WEB-INF/resources/templates/includes/footer.vm
--- a/WebContent/WEB-INF/resources/templates/includes/footer.vm	Thu Jul 29 18:14:27 2010 -0400
+++ b/WebContent/WEB-INF/resources/templates/includes/footer.vm	Thu Jul 29 18:15:20 2010 -0400
@@ -11,7 +11,7 @@
 			#if ($locale.getName() == $lang)
 			$localeName
 			#else
-			#set($langKey = $locale.getName())
+			#set($langKey = $strUtils.replace($locale.getName(), '_', '-'))
 			<a href="${queryString}ucn_lang=$langKey" lang="$langKey" xml:lang="$langKey" hreflang="$langKey" rel="alternate">$localeName</a>
 			#end
 		</li>
diff -r 011fa831225c -r e7f37371fb0d WebContent/WEB-INF/resources/templates/language.vm
--- a/WebContent/WEB-INF/resources/templates/language.vm	Thu Jul 29 18:14:27 2010 -0400
+++ b/WebContent/WEB-INF/resources/templates/language.vm	Thu Jul 29 18:15:20 2010 -0400
@@ -23,7 +23,7 @@
 				<select name="${param_prefix}lang">
 					<optgroup label="Select a language">
 					#foreach ($locale in $availableLocales)
-					#set($localeKey = $locale.getName())
+					#set($localeKey = $strUtils.replace($locale.getName(), '_', '-'))
 						<option value="$localeKey" xml:lang="$localeKey" #if($native_lang == $localeKey)selected="selected"#end>$esc.html($strUtils.capitalize($locale.getDisplayName($defaultLocale))) - $esc.html($strUtils.capitalize($locale.getDisplayName($locale)))</option>
 					#end
 					</optgroup>

Received on Thursday, 29 July 2010 22:18:33 UTC