CVS: phpweather/locales locale_common.php,1.3,1.4 locale_da.php,1.1,1.2 locale_en.php,1.3,1.4

[Martin Geisler]

Update of /cvsroot/phpweather/phpweather/locales
In directory usw-pr-cvs1:/tmp/cvs-serv7746

Modified Files:
        locale_common.php locale_da.php locale_en.php 
Log Message:
I changed some of the strings so that Gyulai Mih�ly can translate it
into Hungarian (at least I hope he can :-)


Index: locale_common.php
===================================================================
RCS file: /cvsroot/phpweather/phpweather/locales/locale_common.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- locale_common.php   2001/06/30 19:22:19     1.3
+++ locale_common.php   2001/07/01 18:20:43     1.4
@@ -621,13 +621,19 @@
          $dir_beg_str = $this->strings['wind_dir'][intval(round($var_beg/22.5))];
          $dir_end_str = $this->strings['wind_dir'][intval(round($var_end/22.5))];
          
-         $wind_str .= $this->strings['wind_varying'] .
-           $this->properties['mark_begin'] . $dir_beg_str . 
$this->properties['mark_end'] .
-           ' (' . $this->properties['mark_begin'] . $var_beg . '°' .
-           $this->properties['mark_end'] . ') ' . $this->strings['and'] .
-           $this->properties['mark_begin'] . $dir_end_str . 
$this->properties['mark_end'] . 
-           ' (' . $this->properties['mark_begin'] . $var_end . '°' .
-           $this->properties['mark_end'] . ')';
+         $wind_str .= sprintf($this->strings['wind_varying'],
+                               $this->properties['mark_begin'],
+                               $dir_beg_str,
+                               $this->properties['mark_end'],
+                               $this->properties['mark_begin'],
+                               $var_beg,
+                               $this->properties['mark_end'],
+                               $this->properties['mark_begin'],
+                               $dir_end_str,
+                               $this->properties['mark_end'],
+                               $this->properties['mark_begin'],
+                               $var_end,
+                               $this->properties['mark_end']);
        }
       }
     } else {
@@ -709,10 +715,11 @@
        $cloud_str3 = '';
       }
 
-      $output['clouds'] = $this->strings['cloud_group'] .
+      $output['clouds'] = $this->strings['cloud_group_beg'] .
        $this->list_sentences($cloud_str1,
                              $cloud_str2,
-                             $cloud_str3) . '.';
+                             $cloud_str3) .
+        $this->strings['cloud_group_end'];
     }
   }
 

Index: locale_da.php
===================================================================
RCS file: /cvsroot/phpweather/phpweather/locales/locale_da.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- locale_da.php       2001/06/30 19:19:52     1.1
+++ locale_da.php       2001/07/01 18:20:43     1.2
@@ -41,7 +41,7 @@
     $this->strings['wind_with_gusts']          = ' med vindstød på up 
til ';
     $this->strings['wind_from']                = ' fra ';
     $this->strings['wind_variable']            = ' fra %svarierende%s retninger.';
-    $this->strings['wind_varying']             = ', varierende mellem ';
++    $this->strings['wind_varying']             = ', varierende mellem %s%s%s 
+(%s%s°%s) og %s%s%s (%s%s°%s)';
     $this->strings['wind_calm']                = 'Vinden var %sstille%s';
     $this->strings['wind_dir'] = array(
       'nord',
@@ -93,7 +93,8 @@
     $this->strings['dew_point']       = ', med et dugpunkt på ';
     $this->strings['altimeter']       = 'Lufttrykket var ';
     $this->strings['rel_humidity']    = 'Den relative luftfugtigheden var ';
-    $this->strings['cloud_group']     = 'Der var ';
+    $this->strings['cloud_group_beg'] = 'Der var ';
+    $this->strings['cloud_group_end'] = '.';
     $this->strings['cloud_clear']     = 'Himlen var %sskyfri%s.';
     $this->strings['cloud_height']    = ' skyer i en højde af ';
     $this->strings['cloud_overcast']  = 'himlen var %soverskyet%s i en højde 
af ';

Index: locale_en.php
===================================================================
RCS file: /cvsroot/phpweather/phpweather/locales/locale_en.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- locale_en.php       2001/06/30 19:22:19     1.3
+++ locale_en.php       2001/07/01 18:20:43     1.4
@@ -41,7 +41,7 @@
     $this->strings['wind_with_gusts']          = ' with gusts up to ';
     $this->strings['wind_from']                = ' from ';
     $this->strings['wind_variable']            = ' from %svariable%s directions.';
-    $this->strings['wind_varying']             = ', varying between ';
+    $this->strings['wind_varying']             = ', varying between %s%s%s 
+(%s%s°%s) and %s%s%s (%s%s°%s)';
     $this->strings['wind_calm']                = 'The wind was %scalm%s';
     $this->strings['wind_dir'] = array(
       'north',
@@ -93,7 +93,8 @@
     $this->strings['dew_point']       = ', with a dew-point at ';
     $this->strings['altimeter']       = 'The atmospheric pressure was ';
     $this->strings['rel_humidity']    = 'The relative humidity was ';
-    $this->strings['cloud_group']     = 'There were ';
+    $this->strings['cloud_group_beg'] = 'There were ';
+    $this->strings['cloud_group_end'] = '.';
     $this->strings['cloud_clear']     = 'The sky was %sclear%s.';
     $this->strings['cloud_height']    = ' clouds at a height of ';
     $this->strings['cloud_overcast']  = 'the sky was %sovercast%s from a height of ';


_______________________________________________
PHPWeather-checkins mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/phpweather-checkins