Changeset 9373

Show
Ignore:
Timestamp:
03/24/10 18:09:41 (3 years ago)
Author:
p_lindheimer
Message:

Merged revisions 9252-9372 via svnmerge from
http://svn.freepbx.org/freepbx/branches/2.7

........

r9258 | mickecarlsson | 2010-03-16 23:06:11 -0700 (Tue, 16 Mar 2010) | 1 line


Updated tool with --no-location option when creating .pot files

........

r9367 | p_lindheimer | 2010-03-24 14:29:37 -0700 (Wed, 24 Mar 2010) | 1 line


link a copy of libfreepbx.javascripts.js to theme/js directory accessible by ARI users re #4158

........

r9372 | p_lindheimer | 2010-03-24 15:07:05 -0700 (Wed, 24 Mar 2010) | 1 line


more tweaks to install script to avoid confusing warnings re #4158

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/trunk

    • Property svnmerge-integrated changed from /freepbx/branches/2.7:1-9251 to /freepbx/branches/2.7:1-9372

  • freepbx/trunk/amp_conf/htdocs/recordings/theme/page.tpl.php

    r8040 r9373  
    55    <link rel="stylesheet" href="theme/main.css" type="text/css"> 
    66    <meta http-equiv="content-type" content="text/html; charset=UTF-8"> 
    7     <script  type="text/javascript" src="../../admin/common/libfreepbx.javascripts.js"></script> 
     7    <script  type="text/javascript" src="theme/js/libfreepbx.javascripts.js"></script> 
    88  </head> 
    99  <body> 

  • freepbx/trunk/install_amp

    r8599 r9373  
    10391039  if (!is_dir("/var/spool/asterisk/voicemail/device")) amp_mkdir("/var/spool/asterisk/voicemail/device", "0755", true); 
    10401040  out("OK (".$num_copied." files copied, ".($num_files-$num_copied)." skipped)"); 
     1041 
     1042  // link the packed js library for ARI, if there the error will indicate that 
     1043  $libfreepbx = $amp_conf['AMPWEBROOT'].'/admin/common/libfreepbx.javascripts.js'; 
     1044  $dest_libfreepbx = $amp_conf['AMPWEBROOT'].'/recordings/theme/js/libfreepbx.javascripts.js';  
     1045  if (file_exists($libfreepbx) && !file_exists($dest_libfreepbx)) { 
     1046    outn(_("linking libfreepbx.javascripts.js to theme/js..")); 
     1047    if (link($libfreepbx, $dest_libfreepbx)) { 
     1048      out(_("ok")); 
     1049    } else { 
     1050      out(_("possible error - check warning message")); 
     1051    } 
     1052  } 
    10411053} 
    10421054 

  • freepbx/trunk/update_i18n.sh

    r8878 r9373  
    3838  echo "Creating ${modules%%/}.pot file, extracting text strings" 
    3939  # Save the file as a temp file 
    40   find ${modules%%/}/*.php | xargs xgettext -L PHP -o ${modules%%/}/i18n/${modules%%/}.tmp --keyword=_ - 
     40  find ${modules%%/}/*.php | xargs xgettext --no-location -L PHP -o ${modules%%/}/i18n/${modules%%/}.tmp --keyword=_ - 
    4141  # Now add the copyright and the license info to the.pot file 
    4242  # Again, could be done better, but I lack the time and really need this out now 
    …… 
    7171# spit out the module.xml for core to amp.i18.php so that we can grab it with the find 
    7272/var/lib/asterisk/bin/module_admin i18n core > admin/modules/core/core.i18n.php 
    73 find admin/*.php admin/cdr/*.php admin/views/*.php admin/common/*.php admin/modules/core/*.php -maxdepth 0 | xargs xgettext -L PHP -o admin/i18n/amp.pot --keyword=_ - 
     73find admin/*.php admin/cdr/*.php admin/views/*.php admin/common/*.php admin/modules/core/*.php -maxdepth 0 | xargs xgettext --no-location -L PHP -o admin/i18n/amp.pot --keyword=_ - 
    7474# remove the <modulename>.i18.php 
    7575rm admin/modules/core/core.i18n.php