Context Navigation

← Previous Changeset
Next Changeset →

Changeset 1008:87495662e9d3

Timestamp:

03/20/10 17:17:43 (3 years ago)

Author:

tgambet

Branch:

default

convert_revision:

svn:cdcfb263-7567-472c-a848-e2c2df3466e7/trunk@1009

Message:

updated to match new code regarding localization

Location:

WebContent/WEB-INF/resources/templates

Files:

: 4 modified

includes/footer.vm (modified) (1 diff)
includes/head.vm (modified) (1 diff)
language.form.vm (modified) (4 diffs)
language.vm (modified) (4 diffs)

Legend:

: Unmodified
: Added
: Removed

WebContent/WEB-INF/resources/templates/includes/footer.vm

r933	r1008
6	6	</ul>
7	7	<ul id="lang_choice">
8		#foreach( $~~key in $languages.keySet()~~ )
	8	#foreach( $locale in $languages )
9	9	<li>
10		#if ($key == $lang)
11		$languages.get($key)
	10	#set($localeName = $strUtils.capitalize($locale.getDisplayName($locale)))
	11	#if ($locale.getName() == $lang)
	12	$localeName
12	13	#else
13		<a href="${queryString}ucn_lang=$key" lang="$key" xml:lang="$key" hreflang="$key" rel="alternate">$languages.get($key)</a>
	14	#set($langKey = $locale.getName())
	15	<a href="${queryString}ucn_lang=$langKey" lang="$langKey" xml:lang="$langKey" hreflang="$langKey" rel="alternate">$localeName</a>
14	16	#end
15	17	</li>

WebContent/WEB-INF/resources/templates/includes/head.vm

r877	r1008
1	1	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
2		<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="$lang" lang="$lang" dir="$!direction">
	2	<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="$lang" lang="$lang" dir="$direction">
3	3	<head>
4	4	<title>$title</title>

WebContent/WEB-INF/resources/templates/language.form.vm

r971	r1008
25	25	</legend>
26	26
27		~~<input type="hidden" name="${param_prefix}lang" value="$prop.get('lang')"/>~~
28
29	27	<table style="width:100%">
30	28	<thead>
31	29	<tr>
32		<th scope="col" class="first_col">$~~defaultProps.get("language"~~) properties</th>
33		#set($percent = 100 * $math.div($math.~~sub($math.add($prop.size(), $metadatas.size()), 4), $math.sub($math.add($defaultProps.size(), $defaultMetadata.size()), 4~~)))
34		<th scope="col">$~~prop.get("language"~~) $percent.intValue()%</th>
	30	<th scope="col" class="first_col">$strUtils.capitalize($defaultLocale.getDisplayName($defaultLocale)) properties</th>
	31	#set($percent = 100 * $math.div($math.add($prop.size(), $metadatas.size()), $math.add($defaultProps.size(), $defaultMetadata.size())))
	32	<th scope="col">$strUtils.capitalize($transLocale.getDisplayName($transLocale)) $percent.intValue()%</th>
35	33	</tr>
36	34	</thead>
…	…
40	38	<tr>
41	39	<th class="property_name" scope="row">$key <p>$!esc.html($defaultProps.get($key))</p></th>
42		<td class="missing"><input type="text" name="$~~prop.get('lang'~~)_$key" value="$!esc.html($!prop.get($key))" /></td>
	40	<td class="missing"><input type="text" name="$transLocale.getName()_$key" value="$!esc.html($!prop.get($key))" /></td>
43	41	</tr>
44	42	#end
45	43	#end
46	44	#foreach($key in $defaultMetadata.keySet())
47		#if (!$metadatas.get($key) ~~&& $key != "lang" && $key != "language"~~)
	45	#if (!$metadatas.get($key))
48	46	<tr>
49	47	<th class="property_name" scope="row">$key <p>$!esc.html($defaultMetadata.get($key))</p></th>
50		<td class="missing"><input type="text" name="metadata_$~~metadatas.get('lang'~~)_$key" value="$!esc.html($!metadatas.get($key))" /></td>
	48	<td class="missing"><input type="text" name="metadata_$transLocale.getName()_$key" value="$!esc.html($!metadatas.get($key))" /></td>
51	49	</tr>
52	50	#end
…	…
54	52
55	53	#foreach($key in $defaultProps.keySet())
56		#if ($~~key != "lang" && $key != "language" && $~~prop.get($key))
	54	#if ($prop.get($key))
57	55	<tr>
58	56	<th class="property_name" scope="row">$key <p>$!esc.html($defaultProps.get($key))</p></th>
59		<td #if(!$prop.get($key))class="missing"#end><input type="text" name="$~~prop.get('lang'~~)_$key" value="$!esc.html($!prop.get($key))" /></td>
	57	<td #if(!$prop.get($key))class="missing"#end><input type="text" name="$transLocale.getName()_$key" value="$!esc.html($!prop.get($key))" /></td>
60	58	</tr>
61	59	#end
62	60	#end
63	61	#foreach($key in $defaultMetadata.keySet())
64		#if ($~~key != "lang" && $key != "language" && $~~metadatas.get($key))
	62	#if ($metadatas.get($key))
65	63	<tr>
66	64	<th class="property_name" scope="row">$key <p>$!esc.html($defaultMetadata.get($key))</p></th>
67		<td #if(!$metadatas.get($key))class="missing"#end><input type="text" name="metadata_$~~metadatas.get('lang'~~)_$key" value="$!esc.html($!metadatas.get($key))" /></td>
	65	<td #if(!$metadatas.get($key))class="missing"#end><input type="text" name="metadata_$transLocale.getName()_$key" value="$!esc.html($!metadatas.get($key))" /></td>
68	66	</tr>
69	67	#end
…	…
73	71
74	72	<div class="submit">
75		<input type="hidden" name="translation_language" value="$~~prop.get('lang'~~)" />
	73	<input type="hidden" name="translation_language" value="$transLocale.getName()" />
76	74	<input type="submit" value="Submit" />
77	75	</div>

WebContent/WEB-INF/resources/templates/language.vm

r988	r1008
10	10	<div class="text">
11	11	<h2>Translation of Unicorn</h2>
12		#set($langNb = $~~languageProps.size() + 1~~)
	12	#set($langNb = $uiLocales.size())
13	13	<p>Unicorn is currently available in $langNb languages. <!--The translations are mainly contributed by <a href="thanks.html">volunteers</a>.--></p>
14	14
…	…
23	23	<select name="${param_prefix}lang">
24	24	<optgroup label="Select a language">
25		#foreach ($key in $availableLocales.keySet())
26		<option value="$key" xml:lang="$key" #if($native_lang == $key)selected="selected"#end>$availableLocales.get($key)</option>
	25	#foreach ($locale in $availableLocales)
	26	#set($localeKey = $locale.getName())
	27	<option value="$localeKey" xml:lang="$localeKey" #if($native_lang == $localeKey)selected="selected"#end>$esc.html($strUtils.capitalize($locale.getDisplayName($locale)))</option>
27	28	#end
28	29	</optgroup>
…	…
57	58	<tr>
58	59	<th scope="col">Property</th>
59		#foreach($prop in $languageProps)
60		#set($percent = 100 * $math.div($math.sub($math.add($prop.size(), $metadataProps.get($prop.get('lang')).size()), 4), $math.sub($math.add($defaultProps.size(), $defaultMetadata.size()), 4)))
61		<th scope="col">$prop.get("language")<br />$percent.intValue()% <a href="./translations?ucn_lang=$prop.get('lang')">Edit</a></th>
	60	#foreach($locale in $uiLocales)
	61	#if ($locale != $defaultLocale)
	62	#set($prop = $languageProps.get($locale))
	63	#set($meta = $metadataProps.get($locale))
	64	#set($percent = 100 * $math.div($math.add($prop.size(), $meta.size()), $math.add($defaultProps.size(), $defaultMetadata.size())))
	65	<th scope="col">$strUtils.capitalize($locale.getDisplayName($locale))<br />$percent.intValue()% <a href="./translations?ucn_lang=$locale.getName()">Edit</a></th>
	66	#end
62	67	#end
63	68	</tr>
…	…
65	70	<tbody>
66	71	#foreach($key in $defaultProps.keySet())
67		~~#if ($key != "lang" && $key != "language")~~
68	72	<tr>
69	73	<th class="property_name" scope="row">$key <p>$esc.xml($defaultProps.get($key))</p></th>
70		#foreach($prop in $languageProps)
	74	#foreach($locale in $uiLocales)
	75	#if ($locale != $defaultLocale)
	76	#set($localeKey = $locale.getName())
	77	#set($prop = $languageProps.get($locale))
71	78	#if($prop.get($key))
72		<td class="ok"><span xml:lang="$~~prop.get('lang')~~" title="$!esc.xml($prop.get($key))">✔</span></td>
	79	<td class="ok"><span xml:lang="$localeKey" title="$!esc.xml($prop.get($key))">✔</span></td>
73	80	#{else}
74		<td class="missing"><span title="Missing translation of "$esc.xml($defaultProps.get($key))" in ~~language "$prop.get('language')""><a href="./translations?ucn_lang=$prop.get('lang')~~">✘</a></span></td>
	81	<td class="missing"><span title="Missing translation of "$esc.xml($defaultProps.get($key))" in $locale.getDisplayName($defaultLocale)"><a href="./translations?ucn_lang=$localeKey">✘</a></span></td>
75	82	#end
76	83	#end
	84	#end
77	85	</tr>
78		~~#end~~
79	86	#end
80	87	#foreach($key in $defaultMetadata.keySet())
81		~~#if ($key != "lang" && $key != "language")~~
82	88	<tr>
83	89	<th class="property_name" scope="row">$key <p>$esc.xml($defaultMetadata.get($key))</p></th>
84		#foreach($meta in $metadataProps)
	90	#foreach($locale in $uiLocales)
	91	#if ($locale != $defaultLocale)
	92	#set($localeKey = $locale.getName())
	93	#set($meta = $metadataProps.get($locale))
85	94	#if($meta.get($key))
86		<td class="ok"><span xml:lang="~~$meta.get('lang')~~" title="$!esc.xml($meta.get($key))">✔</span></td>
	95	<td class="ok"><span xml:lang="localeKey" title="$!esc.xml($meta.get($key))">✔</span></td>
87	96	#{else}
88		<td class="missing"><span title="Missing translation of "$esc.xml($defaultMetadata.get($key))" in ~~language "$meta.get('language')""><a href="./translations?ucn_lang=$meta.get('lang')~~">✘</a></span></td>
	97	<td class="missing"><span title="Missing translation of "$esc.xml($defaultMetadata.get($key))" in $locale.getDisplayName($defaultLocale)"><a href="./translations?ucn_lang=$localeKey">✘</a></span></td>
89	98	#end
90	99	#end
	100	#end
91	101	</tr>
92		~~#end~~
93	102	#end
94	103	</tbody>

Unicorn - W3C's Unified Validator