<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[13271] CalendarServer/trunk/twistedcaldav</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/13271">13271</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-04-14 13:11:08 -0700 (Mon, 14 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remap Chinese language codes</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwistedcaldavlocalizationpy">CalendarServer/trunk/twistedcaldav/localization.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtesttest_localizationpy">CalendarServer/trunk/twistedcaldav/test/test_localization.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktwistedcaldavlocalizationpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/localization.py (13270 => 13271)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/localization.py 2014-04-14 18:56:23 UTC (rev 13270)
+++ CalendarServer/trunk/twistedcaldav/localization.py 2014-04-14 20:11:08 UTC (rev 13271)
</span><span class="lines">@@ -484,7 +484,19 @@
</span><span class="cx"> outFile.write(result)
</span><span class="cx">
</span><span class="cx">
</span><ins>+def _remapLanguageCode(code):
+ """
+ Remap certain language codes to others, per the localization team
+ """
</ins><span class="cx">
</span><ins>+ if code == "zh-Hans": # Simplified Chinese
+ code = "zh_CN"
+ elif code == "zh-Hant": # Traditional Chinese
+ code = "zh_TW"
+
+ return code
+
+
</ins><span class="cx"> def getLanguage(config):
</span><span class="cx"> """
</span><span class="cx"> If the language has been specified explicitly in the config, return it. Otherwise
</span><span class="lines">@@ -492,8 +504,8 @@
</span><span class="cx">
</span><span class="cx"> @param config: The configuration object to examine
</span><span class="cx"> @type config: ConfigDict
</span><del>- @return: The two-letter language code -- on OS X the supported ones are:
- de, en, es, fr, it, ja, ko, nl
</del><ins>+ @return: The language code -- on OS X the supported ones are:
+ de, en, es, fr, it, ja, ko, nl, zh_CN, zh_TW
</ins><span class="cx"> @rtype: C{str}
</span><span class="cx"> """
</span><span class="cx"> if config.Localization.Language:
</span><span class="lines">@@ -501,6 +513,7 @@
</span><span class="cx">
</span><span class="cx"> try:
</span><span class="cx"> language = NSLocale.preferredLanguages()[0]
</span><ins>+ language = _remapLanguageCode(language)
</ins><span class="cx"> except:
</span><span class="cx"> language = "en"
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtesttest_localizationpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/test_localization.py (13270 => 13271)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/test_localization.py 2014-04-14 18:56:23 UTC (rev 13270)
+++ CalendarServer/trunk/twistedcaldav/test/test_localization.py 2014-04-14 20:11:08 UTC (rev 13271)
</span><span class="lines">@@ -16,7 +16,9 @@
</span><span class="cx">
</span><span class="cx"> from __future__ import with_statement
</span><span class="cx">
</span><del>-from twistedcaldav.localization import translationTo, getLanguage, _
</del><ins>+from twistedcaldav.localization import (
+ translationTo, getLanguage, _remapLanguageCode, _
+)
</ins><span class="cx"> from twistedcaldav.ical import Component
</span><span class="cx"> from twistedcaldav.test.util import TestCase
</span><span class="cx"> from twistedcaldav.config import ConfigDict
</span><span class="lines">@@ -175,3 +177,13 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> self.assertEquals(getLanguage(ConfigDict({"Localization" : {"Language" : "xyzzy"}})), "xyzzy")
</span><ins>+
+
+ def test_remap(self):
+ """
+ Verify proper remapping of Chinese language codes
+ """
+ self.assertEquals(_remapLanguageCode("en"), "en")
+ self.assertEquals(_remapLanguageCode("zh-Hans"), "zh_CN")
+ self.assertEquals(_remapLanguageCode("zh-Hant"), "zh_TW")
+
</ins></span></pre>
</div>
</div>
</body>
</html>