Changeset 1649 for branches/3.0

Timestamp:

01/24/2007 12:20:33 AM (23 months ago)

Author:

wei

Message:

Fixed #505, #508

Location:

branches/3.0

Files:

• HISTORY (modified) (1 diff)
• demos/quickstart/protected/pages/Advanced/Samples/I18N/Home.php (modified) (1 diff)
• framework/I18N/core/CultureInfo.php (modified) (2 diffs)
• framework/I18N/core/HTTPNegotiator.php (modified) (9 diffs)

branches/3.0/HISTORY

@@ -1 @@
-Version 3.0.7 
+Version 3.0.7 To be released
 ===================
 BUG: Ticket#481 - Unable to cancel navigation when handling OnSideBarButtonClickEvent (Qiang)
 BUG: typo in THttpResponse.writeFile() about sending headers (Qiang)
+BUG: Ticket#505 - cultureInfo::getEnglishName does not return an arrary (Wei)
+BUG: Ticket#508 - CultureInfo class: PHP Notice because of missing static declaration (Wei)
 
 Version 3.0.6 December 4, 2006

branches/3.0/demos/quickstart/protected/pages/Advanced/Samples/I18N/Home.php

@@ -10 +10 @@
                 parent::__construct();
                 $lang = $this->Request['lang'];
-                if(CultureInfo::validCulture($lang)) //only valid lang is permitted
+                $info = new CultureInfo();
+                if($info->validCulture($lang)) //only valid lang is permitted
                         $this->getApplication()->getGlobalization()->setCulture($lang);
         }

branches/3.0/framework/I18N/core/CultureInfo.php

@@ -415 +415 @@
          * Returns <code>array('Language','Country');</code>
          * 'Country' is omitted if the culture is neutral.
-         * @return array array with language and country as elements.
+         * @return string language (country), it may locale code string if english name does not exist.
          */
         function getEnglishName()
@@ -424 +424 @@
 
                 $language = $culture->findInfo("Languages/{$lang}");
+                if(count($language) == 0)
+                        return $this->culture;
+
                 $region = $culture->findInfo("Countries/{$reg}");
                 if($region)

branches/3.0/framework/I18N/core/HTTPNegotiator.php

@@ -25 +25 @@
 /**
  * HTTPNegotiator class.
- * 
+ *
  * Get the language and charset information from the client browser.
  *
@@ -36 +36 @@
         /**
          * A list of languages accepted by the browser.
-         * @var array 
+         * @var array
          */
         protected $languages;
@@ -42 +42 @@
         /**
          * A list of charsets accepted by the browser
-         * @var array 
+         * @var array
          */
         protected $charsets;
@@ -48 +48 @@
         /**
          * Get a list of languages acceptable by the client browser
-         * @return array languages ordered in the user browser preferences. 
+         * @return array languages ordered in the user browser preferences.
          */
         function getLanguages()
@@ -62 +62 @@
                 //$basedir = CultureInfo::dataDir();
                 //$ext = CultureInfo::fileExt();
+                $info = new CultureInfo();
 
-                foreach(explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $lang) 
+                foreach(explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $lang)
                 {
             // Cut off any q-value that might come after a semi-colon
@@ -69 +70 @@
                 $lang = trim(substr($lang, 0, $pos));
 
-                        if (strstr($lang, '-')) 
+                        if (strstr($lang, '-'))
                         {
                                 $codes = explode('-',$lang);
@@ -92 +93 @@
             }
 
-                        if(CultureInfo::validCulture($lang))
+                        if($info->validCulture($lang))
                                 $this->languages[] = $lang;
         }
-                
+
                 return $this->languages;
         }
@@ -101 +102 @@
         /**
          * Get a list of charsets acceptable by the client browser.
-         * @return array list of charsets in preferable order. 
+         * @return array list of charsets in preferable order.
          */
         function getCharsets()
@@ -113 +114 @@
             return $this->charsets;
 
-                foreach (explode(',', $_SERVER['HTTP_ACCEPT_CHARSET']) as $charset) 
+                foreach (explode(',', $_SERVER['HTTP_ACCEPT_CHARSET']) as $charset)
                 {
-            if (!empty($charset)) 
+            if (!empty($charset))
                 $this->charsets[] = preg_replace('/;.*/', '', $charset);
         }