<!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>[15610] 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/15610">15610</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2016-05-19 09:22:09 -0700 (Thu, 19 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix failure to translate localization strings on OS X.</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>
<h3>Added Paths</h3>
<ul>
<li>CalendarServer/trunk/twistedcaldav/test/data/translations/</li>
<li>CalendarServer/trunk/twistedcaldav/test/data/translations/Testlang.lproj/</li>
<li><a href="#CalendarServertrunktwistedcaldavtestdatatranslationsTestlanglprojcalendarserverstrings">CalendarServer/trunk/twistedcaldav/test/data/translations/Testlang.lproj/calendarserver.strings</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktwistedcaldavlocalizationpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/localization.py (15609 => 15610)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/localization.py 2016-05-19 16:19:55 UTC (rev 15609)
+++ CalendarServer/trunk/twistedcaldav/localization.py 2016-05-19 16:22:09 UTC (rev 15610)
</span><span class="lines">@@ -27,8 +27,8 @@
</span><span class="cx"> from pycalendar.duration import Duration
</span><span class="cx">
</span><span class="cx"> try:
</span><del>- from osx.corefoundation import CFError
- from osx.utils import CFLocaleRef, CFDataRef, CFPropertyListRef
</del><ins>+ from osx.corefoundation import CFError, CFDataRef
+ from osx.utils import CFLocaleRef, CFPropertyListRef
</ins><span class="cx"> foundationImported = True
</span><span class="cx"> except ImportError:
</span><span class="cx"> foundationImported = False
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtestdatatranslationsTestlanglprojcalendarserverstrings"></a>
<div class="binary"><h4>Added: CalendarServer/trunk/twistedcaldav/test/data/translations/Testlang.lproj/calendarserver.strings</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: CalendarServer/trunk/twistedcaldav/test/data/translations/Testlang.lproj/calendarserver.strings
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="CalendarServertrunktwistedcaldavtesttest_localizationpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/test_localization.py (15609 => 15610)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/test_localization.py 2016-05-19 16:19:55 UTC (rev 15609)
+++ CalendarServer/trunk/twistedcaldav/test/test_localization.py 2016-05-19 16:22:09 UTC (rev 15610)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> from __future__ import with_statement
</span><span class="cx">
</span><span class="cx"> from twistedcaldav.localization import (
</span><del>- translationTo, getLanguage, _remapLanguageCode, _
</del><ins>+ foundationImported, processLocalizationFiles, translationTo, getLanguage, _remapLanguageCode, _
</ins><span class="cx"> )
</span><span class="cx"> from twistedcaldav.ical import Component
</span><span class="cx"> from twistedcaldav.test.util import TestCase
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> from pycalendar.datetime import DateTime
</span><span class="cx">
</span><span class="cx"> import os
</span><ins>+import sys
</ins><span class="cx">
</span><span class="cx"> def getComp(str):
</span><span class="cx"> calendar = Component.fromString(str)
</span><span class="lines">@@ -203,3 +204,32 @@
</span><span class="cx"> self.assertEquals(_remapLanguageCode("en"), "en")
</span><span class="cx"> self.assertEquals(_remapLanguageCode("zh-Hans"), "zh_CN")
</span><span class="cx"> self.assertEquals(_remapLanguageCode("zh-Hant"), "zh_TW")
</span><ins>+
+
+ def test_foundationImport(self):
+ """
+ Make sure that on OS X the CoreFoundation imports work.
+ """
+ if sys.platform == "darwin":
+ self.assertTrue(foundationImported)
+
+
+ def test_processLocalizationFiles(self):
+ """
+ Make sure that on OS X the .lproj files are converted properly.
+ """
+ if sys.platform == "darwin":
+ tmpdir = self.mktemp()
+
+ settings = ConfigDict({
+ "TranslationsDirectory": os.path.join(os.path.dirname(__file__), "data", "translations"),
+ "LocalesDirectory": tmpdir,
+ })
+
+ processLocalizationFiles(settings)
+
+ self.assertTrue(os.path.exists(os.path.join(tmpdir, "Testlang", "LC_MESSAGES", "calendarserver.mo")))
+
+ with translationTo('Testlang', localeDir=tmpdir):
+ self.assertEquals(_("String1"), "string 1")
+ self.assertEquals(_("String2"), "string 2")
</ins></span></pre>
</div>
</div>
</body>
</html>