Changeset 1444

Timestamp:

09/23/2006 09:20:54 PM (2 years ago)

Author:

xue

Message:

Merge from 3.0 branch till 1443.

Location:

trunk

Files:

• HISTORY (modified) (1 diff)
• demos/blog/protected/application.xml (modified) (1 diff)
• demos/quickstart/protected/pages/Advanced/I18N.page (modified) (2 diffs)
• demos/quickstart/protected/pages/Configurations/UrlMapping.page (modified) (3 diffs)
• framework/I18N/TGlobalization.php (modified) (4 diffs)
• framework/I18N/Translation.php (modified) (1 diff)
• framework/Web/THttpRequest.php (modified) (1 diff)
• framework/Web/TUrlMapping.php (modified) (6 diffs, 1 prop)
• requirements/index.php (modified) (1 diff)
• requirements/messages-bg.txt (modified) (1 diff)
• requirements/messages-zh.txt (modified) (1 diff)
• requirements/messages.txt (modified) (1 diff)

trunk/HISTORY

@@ -17 +17 @@
 ENH: Ticket#361 - Introduced include template tag that supports including external templates (Qiang)
 ENH: Ticket#366 - white spaces are now allowed around attribute names in template (Qiang)
-ENH: Added an interactive PHP shell, usage: "prado-cli.php shell" (Wei)
+ENH: Ticket#378 - PRADO applications can now run in command line (Qiang)
 ENH: Ticket#379 - TAuthorizationRule performance enhancement (Qiang)
 ENH: Easier to customize the TDatePicker using CssClass (Wei)
+ENH: Added an interactive PHP shell, usage: "prado-cli.php shell" (Wei)
 NEW: TLiteralColumn (Qiang)
-NSW: TUrlMapping (Wei)
+NEW: TUrlMapping (Wei)
 
 Version 3.0.4 September 4, 2006

trunk/demos/blog/protected/application.xml

@@ -16 +16 @@
     </module>
     <module class="System.Util.TParameterModule" ParameterFile="Application.Data.Settings" />
+
+    <!-- use TUrlMapping to map URL patterns to particular requests -->
     <module id="friendly-url" class="System.Web.TUrlMapping">
-      <url pageClass="Posts.ViewPost" pattern="post/{id}/?" parameters.id="\d+" />
-      <url pageClass="Posts.ListPost" pattern="archive/{time}/?" parameters.time="\d{6}" />
-      <url pageClass="Posts.ListPost" pattern="category/{cat}/?" parameters.cat="\d+" />
+      <url ServiceParameter="Posts.ViewPost" pattern="post/{id}/?" parameters.id="\d+" />
+      <url ServiceParameter="Posts.ListPost" pattern="archive/{time}/?" parameters.time="\d{6}" />
+      <url ServiceParameter="Posts.ListPost" pattern="category/{cat}/?" parameters.cat="\d+" />
     </module>
   </modules>

trunk/demos/quickstart/protected/pages/Advanced/I18N.page

@@ -41 +41 @@
     <translation type="XLIFF"
         source="MyApp.messages"
+        marker="@@"
         autosave="true" cache="true" />
 </module>
@@ -49 +50 @@
 attribute if enabled, saves untranslated messages back into the message catalogue.
 With <tt>cache</tt> enabled, translated messages are saved in the application <tt>runtime/i18n</tt> directory.
+The <tt>marker</tt> value is used to surround any untranslated text.
 </p>
 

trunk/demos/quickstart/protected/pages/Configurations/UrlMapping.page

@@ -21 +21 @@
 <com:TTextHighlighter Language="xml" CssClass="source">
 <module id="friendly-url" class="System.Web.TUrlMapping">
-  <url pageClass="ClassName" pattern="regexp" parameters.id="regexp" />
+  <url serviceParameter="ClassName" pattern="regexp" parameters.id="regexp" />
 </module>
 </com:TTextHighlighter>
 </p>
 
-<p>The <tt>PageClass</tt> set the name of class that the matched URL will
-be requested.</p> The <tt>Pattern</tt> and <tt>Parameters</tt> attribute
+<p>The <tt>ServiceParameter</tt> and <tt>ServiceID</tt>
+ (the default ID is 'page') set the service parameter and service ID respectively.
+ The service parameter for the <tt>TPageService</tt> service is the
+ Page class name, e.g., for an URL "index.php?page=Home", "page" is the service ID and the service
+ parameter is "Home". Other services may use the service parameter and ID differently.
+See <a href="?page=Fundamentals.Services">Services</a> for further details.
+</p>
+
+<p>
+The <tt>Pattern</tt> and <tt>Parameters</tt> attribute
 values are regular expression patterns that
 determine the mapping criteria. The <tt>Pattern</tt> property takes
@@ -35 +43 @@
 For example,
 <com:TTextHighlighter Language="xml" CssClass="source">
-<url pageClass="Pages.ShowArticles" pattern="articles/{year}/{month}/{day}"
+<url ServiceParameter="Pages.ShowArticles" pattern="articles/{year}/{month}/{day}"
      parameters.year="\d{4}" parameters.month="\d{2}" parameters.day="\d+" />
 </com:TTextHighlighter>
@@ -41 +49 @@
 The example is equivalent, using regular expression only, to
 <com:TTextHighlighter Language="xml" CssClass="source">
-<url pageClass="Pages.ShowArticles">
+<url ServiceParmaeter="Pages.ShowArticles">
 <![CDATA[
         articles/(?P<year>\d{4})/(?P<month>\d{2})/(?P<day>\d+)

trunk/framework/I18N/TGlobalization.php

@@ -94 +94 @@
         public function setDefaultCulture($culture)
         {
-                $this->_defaultCharset = str_replace('-','_',$culture);
+                $this->_defaultCulture = str_replace('-','_',$culture);
         }
 
@@ -161 +161 @@
          * $config['autosave'] = 'true'; //save untranslated message
          * $config['cache'] = 'true'; //cache translated message
+         * $config['marker'] = '@@'; // surround untranslated text with '@@'
          * </code>
          * Throws exception is source is not found.
@@ -177 +178 @@
                                         throw new TConfigurationException('globalization_source_path_failed',
                                                 $config['source']);
-                                        chmod($config['source'], 0777); //make it deletable                                                                     
+                                        chmod($config['source'], 0777); //make it deletable
                                 }
                         }
@@ -193 +194 @@
                                         throw new TConfigurationException('globalization_cache_path_failed',
                                                 $config['cache']);
-                                chmod($config['cache'], 0777); //make it deletable                              
+                                chmod($config['cache'], 0777); //make it deletable
                         }
                 }

trunk/framework/I18N/Translation.php

@@ -55 +55 @@
                         self::$formatter = new MessageFormat($source, $app->getCharset());
 
+                        //mark untranslated text
+                        if($ps=$config['marker'])
+                                self::$formatter->setUntranslatedPS(array($ps,$ps));
+
                         //save the message on end request
                         Prado::getApplication()->attachEventHandler(

trunk/framework/Web/THttpRequest.php

@@ -597 +597 @@
         }
 
+        protected function getRequestResolved()
+        {
+                return $this->_requestResolved;
+        }
+
         /**
          * @return array IDs of the available services

trunk/framework/Web/TUrlMapping.php

@@ -22 +22 @@
  * <code>
  *  <module id="friendly-url" class="System.Web.TUrlMapping">
- *    <url pageClass="Posts.ViewPost" pattern="post/{id}/?" parameters.id="\d+" />
- *    <url pageClass="Posts.ListPost" pattern="archive/{time}/?" parameters.time="\d{6}" />
- *    <url pageClass="Posts.ListPost" pattern="category/{cat}/?" parameters.cat="\d+" />
+ *    <url ServiceParameter="Posts.ViewPost" pattern="post/{id}/?" parameters.id="\d+" />
+ *    <url ServiceParameter="Posts.ListPost" pattern="archive/{time}/?" parameters.time="\d{6}" />
+ *    <url ServiceParameter="Posts.ListPost" pattern="category/{cat}/?" parameters.cat="\d+" />
  *  </module>
  * </code>
@@ -190 +190 @@
                 $request = $this->getRequest();
                 $id = $pattern->getServiceID();
-                $page = $pattern->getPageClass();
+                $param = $pattern->getServiceParameter();
                 $request->setServiceID($id);
-                $request->setServiceParameter($page);
-                $request->add($id,$page);
+                $request->setServiceParameter($param);
+                $request->add($id,$param);
         }
 }
@@ -228 +228 @@
  * object. For example, <tt>$this->Request['year']</tt>.
  *
- * The {@link setPageClass PageClass} and {@link setServiceID ServiceID}
- * (the default ID is 'page') set the class and the service that will
- * handle the matching URL.
+ * The {@link setServiceParameter ServiceParameter} and {@link setServiceID ServiceID}
+ * (the default ID is 'page') set the service parameter and service id respectively.
+ * The service parameter for the TPageService is the Page class name, other service
+ * may use the service parameter differently.
  *
  * For more complicated mappings, the body of the <tt>&lt;url&gt;</tt>
@@ -243 +244 @@
 {
         /**
-         * @var string page class name.
-         */
-        private $_pageClass;
+         * @var string service parameter such as Page class name.
+         */
+        private $_serviceParameter;
         /**
          * @var string service ID, default is 'page'.
@@ -278 +279 @@
                 if(strlen($body)>0)
                         $this->setPattern($body);
-                if(is_null($this->_pageClass))
+                if(is_null($this->_serviceParameter))
                 {
                         throw new TConfigurationException(
-                                'dispatcher_url_page_class_missing', $this->getPattern());
+                                'dispatcher_url_service_parameter_missing', $this->getPattern());
                 }
                 $this->initializePattern();
@@ -311 +312 @@
 
         /**
-         * @param string name of the page class to handle the request.
-         */
-        public function setPageClass($value)
-        {
-                $this->_pageClass=$value;
-        }
-
-        /**
-         * @return string page class name.
-         */
-        public function getPageClass()
-        {
-                return $this->_pageClass;
+         * @param string service parameter, such as page class name.
+         */
+        public function setServiceParameter($value)
+        {
+                $this->_serviceParameter=$value;
+        }
+
+        /**
+         * @return string service parameter, such as page class name.
+         */
+        public function getServiceParameter()
+        {
+                return $this->_serviceParameter;
         }
 

trunk/requirements/index.php

@@ -55 +55 @@
                 '$_SERVER["PATH_INFO"] check',
                 'PATH_INFO required'),
+        array(
+                true,
+                class_exists('Reflection',false),
+                'Reflection extension check',
+                'Reflection extension required'),
         array(
                 true,

trunk/requirements/messages-bg.txt

@@ -12 +12 @@
 Zlib extension check                    = Проверка за Zlib
 Zlib extension optional                 = Zlib разширението е незадължително. Ако не е заредено, състоянието на страницата няма да бъде компресирано и размера на страницата може да се увеличи.
+Reflection extension check                      = Проверка за Reflection разширението
+Reflection extension required                   = Reflection разширението е задължително за PRADO.
 DOM extension check                     = Проверка за DOM разширението
 DOM extension required                  = DOM разширението е задължително за PRADO. Използва се в TXmlDocument за анализ на XML-базирани конфигурации.

trunk/requirements/messages-zh.txt

@@ -12 +12 @@
 Zlib extension check = Zlib模块检查
 Zlib extension optional = Zlib模块是可选的。如果它不存在，页面的状态信息将无法压缩，由此可能导致您的页面传送数据量增大。
+Reflection extension check = Reflection模块检查
+Reflection extension required = Reflection模块是必须的。如果它不存在，PRADO将无法验证控件模板的正确性。
 DOM extension check = DOM模块检查
 DOM extension required = DOM模块是必须的。如果它不存在，基于XML的各种配置文件将无法解析。

trunk/requirements/messages.txt

@@ -12 +12 @@
 Zlib extension check                            = Zlib extension check
 Zlib extension optional                         = Zlib extension is optional. If it is absent, page state will not be compressed and your page size may increase.
+Reflection extension check                      = Reflection extension check
+Reflection extension required           = Reflection extension is required by PRADO. It is used in by PRADO to check the validity of page templates.
 DOM extension check                                     = DOM extension check
 DOM extension required                          = DOM extension is required by PRADO. It is used in TXmlDocument to parse all sorts of XML-based configurations.