Discussion:
[22968] standard/trunk: ZF-10352: the translate resource should use the same key as the Zend_Translate options
intiilapa
2010-09-18 19:50:02 UTC
Permalink
<!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>[framework-svn][22968] standard/trunk: ZF-10352: the translate resource should use the same key as the Zend_Translate options</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, #logmsg > ol { margin-left: 0; 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>22968</dd>
<dt>Author</dt> <dd>intiilapa</dd>
<dt>Date</dt> <dd>2010-09-18 12:50:02 -0700 (Sat, 18 Sep 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>ZF-10352: the translate resource should use the same key as the Zend_Translate options</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#standardtrunkdocumentationmanualenmodule_specsZend_ApplicationAvailableResourcesTranslatexml">standard/trunk/documentation/manual/en/module_specs/Zend_Application-AvailableResources-Translate.xml</a></li>
<li><a href="#standardtrunkdocumentationmanualfrmodule_specsZend_ApplicationAvailableResourcesTranslatexml">standard/trunk/documentation/manual/fr/module_specs/Zend_Application-AvailableResources-Translate.xml</a></li>
<li><a href="#standardtrunklibraryZendApplicationResourceTranslatephp">standard/trunk/library/Zend/Application/Resource/Translate.php</a></li>
<li><a href="#standardtrunktestsZendApplicationResourceTranslateTestphp">standard/trunk/tests/Zend/Application/Resource/TranslateTest.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="standardtrunkdocumentationmanualenmodule_specsZend_ApplicationAvailableResourcesTranslatexml"></a>
<div class="modfile"><h4>Modified: standard/trunk/documentation/manual/en/module_specs/Zend_Application-AvailableResources-Translate.xml (22967 => 22968)</h4>
<pre class="diff"><span>
<span class="info">--- standard/trunk/documentation/manual/en/module_specs/Zend_Application-AvailableResources-Translate.xml 2010-09-18 18:53:58 UTC (rev 22967)
+++ standard/trunk/documentation/manual/en/module_specs/Zend_Application-AvailableResources-Translate.xml 2010-09-18 19:50:02 UTC (rev 22968) </span><span class="lines">@@ -71,7 +71,7 @@ </span><span class="cx"> </span><span class="cx"> &lt;programlisting language=&quot;ini&quot;&gt;&lt;![CDATA[
</span><span class="cx"> resources.translate.adapter = tmx
</span><del>-resources.translate.data = APPLICATION_PATH &quot;/../data/locales&quot;
</del><ins>+resources.translate.content = APPLICATION_PATH &quot;/../data/locales&quot;
</ins><span class="cx"> resources.translate.scan = Zend_Translate::LOCALE_DIRECTORY
</span><span class="cx">
</span><span class="cx"> ; Optionally you can also the cache template to use for caching:
</span></span></pre></div>
<a id="standardtrunkdocumentationmanualfrmodule_specsZend_ApplicationAvailableResourcesTranslatexml"></a>
<div class="modfile"><h4>Modified: standard/trunk/documentation/manual/fr/module_specs/Zend_Application-AvailableResources-Translate.xml (22967 => 22968)</h4>
<pre class="diff"><span>
<span class="info">--- standard/trunk/documentation/manual/fr/module_specs/Zend_Application-AvailableResources-Translate.xml 2010-09-18 18:53:58 UTC (rev 22967)
+++ standard/trunk/documentation/manual/fr/module_specs/Zend_Application-AvailableResources-Translate.xml 2010-09-18 19:50:02 UTC (rev 22968) </span><span class="lines">@@ -1,5 +1,5 @@ </span><span class="cx"> &lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt; </span><del>-&lt;!-- EN-Revision: --&gt; </del><ins>+&lt;!-- EN-Revision: 22966 --&gt; </ins><span class="cx"> &lt;!-- Reviewed: no --&gt; </span><span class="cx"> &lt;sect2 id=&quot;zend.application.available-resources.translate&quot;&gt; </span><span class="cx"> &lt;title&gt;Zend_Application_Resource_Translate&lt;/title&gt; </span><span class="lines">@@ -75,7 +75,7 @@ </span><span class="cx"> </span><span class="cx"> &lt;programlisting language=&quot;ini&quot;&gt;&lt;![CDATA[
</span><span class="cx"> resources.translate.adapter = tmx
</span><del>-resources.translate.data = APPLICATION_PATH &quot;/../data/locales&quot;
</del><ins>+resources.translate.content = APPLICATION_PATH &quot;/../data/locales&quot;
</ins><span class="cx"> resources.translate.scan = Zend_Translate::LOCALE_DIRECTORY
</span><span class="cx">
</span><span class="cx"> ; Optionnellement, on peut utiliser un modèle du gestionnaire de cache :
</span></span></pre></div>
<a id="standardtrunklibraryZendApplicationResourceTranslatephp"></a>
<div class="modfile"><h4>Modified: standard/trunk/library/Zend/Application/Resource/Translate.php (22967 => 22968)</h4>
<pre class="diff"><span>
<span class="info">--- standard/trunk/library/Zend/Application/Resource/Translate.php 2010-09-18 18:53:58 UTC (rev 22967)
+++ standard/trunk/library/Zend/Application/Resource/Translate.php 2010-09-18 19:50:02 UTC (rev 22968) </span><span class="lines">@@ -67,9 +67,14 @@ </span><span class="cx"> if (null === $this-&gt;_translate) { </span><span class="cx"> $options = $this-&gt;getOptions();
</span><span class="cx">
</span><del>- if (!isset($options['data'])) {
</del><ins>+ if (!isset($options['content']) &amp;&amp; !isset($options['data'])) {
</ins><span class="cx"> require_once 'Zend/Application/Resource/Exception.php';
</span><span class="cx"> throw new Zend_Application_Resource_Exception('No translation source data provided.');
</span><ins>+ } else if (array_key_exists('content', $options) &amp;&amp; array_key_exists('data', $options)) {
+ require_once 'Zend/Application/Resource/Exception.php';
+ throw new Zend_Application_Resource_Exception(
+ 'Conflict on translation source data: choose only one key between content and data.'
+ );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (empty($options['adapter'])) {
</span></span></pre></div>
<a id="standardtrunktestsZendApplicationResourceTranslateTestphp"></a>
<div class="modfile"><h4>Modified: standard/trunk/tests/Zend/Application/Resource/TranslateTest.php (22967 => 22968)</h4>
<pre class="diff"><span>
<span class="info">--- standard/trunk/tests/Zend/Application/Resource/TranslateTest.php 2010-09-18 18:53:58 UTC (rev 22967)
+++ standard/trunk/tests/Zend/Application/Resource/TranslateTest.php 2010-09-18 19:50:02 UTC (rev 22968) </span><span class="lines">@@ -179,6 +179,50 @@ </span><span class="cx"> $this-&gt;assertType('Zend_Cache_Core', Zend_Translate::getCache());
</span><span class="cx"> Zend_Translate::clearCache();
</span><span class="cx"> }
</span><ins>+
+ /**
+ * @group ZF-10352
+ */
+ public function testToUseTheSameKeyAsTheOptionsZendTranslate()
+ {
+ $options = array(
+ 'adapter' =&gt; 'array',
+ 'content' =&gt; array(
+ 'm1' =&gt; 'message1',
+ 'm2' =&gt; 'message2'
+ ),
+ 'locale' =&gt; 'auto'
+ );
+
+ $resource = new Zend_Application_Resource_Translate($options);
+ $translator = $resource-&gt;init();
+
+ $this-&gt;assertEquals(new Zend_Translate($options), $translator);
+ $this-&gt;assertEquals('message2', $translator-&gt;_('m2'));
+ }
+
+ /**
+ * @group ZF-10352
+ * @expectedException Zend_Application_Resource_Exception
+ */
+ public function testToUseTheTwoKeysContentAndDataShouldThrowsException()
+ {
+ $options = array(
+ 'adapter' =&gt; 'array',
+ 'content' =&gt; array(
+ 'm1' =&gt; 'message1',
+ 'm2' =&gt; 'message2'
+ ),
+ 'data' =&gt; array(
+ 'm3' =&gt; 'message3',
+ 'm4' =&gt; 'message4'
+ ),
+ 'locale' =&gt; 'auto'
+ );
+
+ $resource = new Zend_Application_Resource_Translate($options);
+ $translator = $resource-&gt;init();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (PHPUnit_MAIN_METHOD == 'Zend_Application_Resource_TranslateTest::main') {
</span></span></pre>
</div>
</div>

</body>
</html>

Loading...