Changeset 7286

Show
Ignore:
Timestamp:
11/16/08 16:01:39 (5 years ago)
Author:
p_lindheimer
Message:

Merged revisions 7273-7285 via svnmerge from
http://svn.freepbx.org/modules/branches/2.5

........

r7279 | p_lindheimer | 2008-11-16 09:37:21 -0800 (Sun, 16 Nov 2008) | 1 line


fixes #3401 introduced from ref #3368

........

r7280 | p_lindheimer | 2008-11-16 11:59:09 -0800 (Sun, 16 Nov 2008) | 1 line


fixes #3404 jump through hoops to translate strings coming from Asterisk

........

r7281 | p_lindheimer | 2008-11-16 12:06:58 -0800 (Sun, 16 Nov 2008) | 1 line


fixes #3400 make sure no duplicates in queue memebers

........

r7284 | p_lindheimer | 2008-11-16 12:51:03 -0800 (Sun, 16 Nov 2008) | 1 line


Module Publish Script: queues 2.5.4.5

........

r7285 | p_lindheimer | 2008-11-16 12:52:25 -0800 (Sun, 16 Nov 2008) | 1 line


Module Publish Script: dashboard 2.5.0.4

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.6

    • Property svnmerge-integrated changed from /modules/branches/2.5:1-7272 to /modules/branches/2.5:1-7285

  • modules/branches/2.6/dashboard/class.astinfo.php

    r7186 r7286  
    215215    } 
    216216    $astout = explode("\n",$response['data']); 
    217        
     217 
     218 
     219    // Only translate and do the preg_replace if in another language, since it is a somewhat expensive operation 
     220    // 
     221    if ($_COOKIE['lang'] == "en_US") { 
     222      $translate = false; 
     223    } else { 
     224      $translate = true; 
     225      $units = array( 
     226        '/second/', '/seconds/', 
     227        '/minute/', '/minutes/', 
     228        '/hour/', '/hours/', 
     229        '/day/', '/days/', 
     230        '/week/', '/weeks/', 
     231        '/year/', '/years/', 
     232      ); 
     233      $tunits = array( 
     234        _('second'), _('seconds'), 
     235        _('minute'), _('minutes'), 
     236        _('hour'), _('hours'), 
     237        _('day'), _('days'), 
     238        _('week'), _('weeks'), 
     239        _('year'), _('years'), 
     240      ); 
     241    } 
    218242    foreach ($astout as $line) { 
    219243      if (preg_match('/^System uptime: (.*)$/i',$line,$matches)) { 
    220244        $output["system"] = preg_replace('/,\s+(\d+ seconds?)?\s*$/', '', $matches[1]);        
     245        if ($translate) { 
     246          $output["system"] = preg_replace($units,$tunits,$output["system"]); 
     247        } 
    221248      } else if (preg_match('/^Last reload: (.*)$/i',$line,$matches)) { 
    222249        $output["reload"] = preg_replace('/,\s+(\d+ seconds?)?\s*$/', '', $matches[1]); 
     250        if ($translate) { 
     251          $output["reload"] = preg_replace($units,$tunits,$output["reload"]); 
     252        } 
    223253      } 
    224254    } 

  • modules/branches/2.6/dashboard/dashboard.css

    r7222 r7286  
    3535.infobox h3 { 
    3636  color: white; 
    37   margin-bottom:2px; 
    38   margin-top:3px; 
    3937} 
    4038 

  • modules/branches/2.6/dashboard/module.xml

    r7274 r7286  
    22  <rawname>dashboard</rawname> 
    33  <name>System Dashboard</name> 
    4   <version>2.5.0.3</version> 
     4  <version>2.5.0.4</version> 
    55  <candisable>no</candisable> 
    66  <canuninstall>no</canuninstall> 
    …… 
    1818  </depends> 
    1919  <changelog> 
     20    *2.5.0.4* #3401, #3404 
    2021    *2.5.0.3* #3348, localizations 
    2122    *2.5.0.2* localization string enclosures 

  • modules/branches/2.6/dashboard/page.index.php

    r7250 r7286  
    282282  global $astinfo; 
    283283  $out = "<h3>"._("Uptime")."</h3><br />"; 
    284   $out .= '<table summary="system information table">'; 
     284  $out .= '<table summary="'._('System Information Table').'">'; 
    285285  /* 
    286286  $out .= '<tr><th>Distro:</th><td>'.$sysinfo->distro().'</td></tr>'; 

  • modules/branches/2.6/queues/functions.inc.php

    r6900 r7286  
    424424  if (isset($members)) { 
    425425    $count = 0; 
     426    $members = array_unique($members); 
    426427    foreach ($members as $member) { 
    427428      $fields[] = array($account,'member',$member,$count); 

  • modules/branches/2.6/queues/module.xml

    r6928 r7286  
    22  <rawname>queues</rawname> 
    33  <name>Queues</name> 
    4   <version>2.5.4.4</version> 
     4  <version>2.5.4.5</version> 
    55  <type>setup</type> 
    66  <category>Inbound Call Control</category> 
    …… 
    99  </description> 
    1010  <changelog> 
     11    *2.5.4.5* #3400, #3380, various translations 
    1112    *2.5.4.4* #3242, #3230, localization fixes 
    1213    *2.5.4.3* #3222 sqlite3 
    …… 
    4142    <queues>Queues</queues> 
    4243  </menuitems> 
    43   <location>release/2.5/queues-2.5.4.4.tgz</location> 
    44   <md5sum>b57a3db9b9d3edd45087901dfbfb9b1f</md5sum> 
     44  <location>release/2.5/queues-2.5.4.5.tgz</location> 
     45  <md5sum>4d5336ea4f133ddd78fd1e545f3ce6aa</md5sum> 
    4546</module>