Changeset 1699

Show
Ignore:
Timestamp:
08/26/08 15:08:13 (3 months ago)
Author:
momo-i
Message:

if can't use gettext, emulate gettext(). update some templates.

Location:
trunk
Files:
2 added
6 modified

Legend:

Unmodified
Added
Removed

  • trunk/admin/mail.php

    r1696 r1699  
    7373                AmpacheMail::$additional_header = array(); 
    7474                AmpacheMail::$additional_header[] = 'X-Ampache-Mailer: 0.0.1'; 
     75                AmpacheMail::$additional_header[] = "From: " . AmpacheMail::$from; 
     76                AmpacheMail::$additional_header[] = "Bcc: $recipient"; 
    7577                if(function_exists('mb_send_mail')) { 
    7678                        AmpacheMail::$additional_header[] = 'Content-Type: text/plain; charset=UTF-8'; 
    … …  
    8082                        AmpacheMail::$additional_header[] = 'Content-Transfer-Encoding: 7bit'; 
    8183                } 
    82                 AmpacheMail::$additional_header[] = "From: " . AmpacheMail::$from; 
    83                 AmpacheMail::$additional_header[] = "Bcc: $recipient"; 
    8484                AmpacheMail::$sender = $GLOBALS['user']->email; 
    8585 

  • trunk/docs/CHANGELOG

    r1698 r1699  
    55-------------------------------------------------------------------------- 
    66  v.3.5-Alpha1 
     7        - Added Emulate gettext() from upgradephp-15 
     8                (http://freshmeat.net/p/upgradephp) 
     9        - Fixed Test.php parse error. 
     10        - Updated multibyte character strings mail. 
     11        - Fixed To send mail don't remove the last comma from recipient. 
     12        - Updated More translatable templates. 
     13        - Removed merge-messages.sh and Add LANGLIST (each languages  
     14                translation statistics). 
     15        - Fixed If database name don't named ampache, can't renamed tags 
     16                to tag. 
    717        - Fixed count issue on browse Artists (Thx Sylvander) 
    818        - Fixed prevent_multiple_logins, preventing all logins (Thx hugh) 

  • trunk/lib/init.php

    r1635 r1699  
    4444require_once $prefix . '/lib/general.lib.php'; 
    4545require_once $prefix . '/lib/class/config.class.php'; 
     46 
     47if (!function_exists('gettext')) { 
     48        require_once $prefix . '/modules/emulater/gettext.php'; 
     49} 
    4650 
    4751// Define some base level config options 

  • trunk/templates/show_artist.inc.php

    r1673 r1699  
    2323?> 
    2424<?php 
    25 show_box_top(sprintf(ngettext('%s by %s', '%ss by %s', count(ucfirst($object_type))) , ucfirst($object_type) ,$artist->f_name),'info-box'); 
     25show_box_top(sprintf(gettext('%s by %s'), ucfirst($object_type) ,$artist->f_name),'info-box'); 
    2626if (Config::get('ratings')) {  
    2727?> 

  • trunk/templates/show_democratic.inc.php

    r1692 r1699  
    2020*/ 
    2121 
    22 show_box_top(sprintf(_('Playlist %s') ,$democratic->name));  
     22show_box_top(sprintf(_('%s Playlist') ,$democratic->name));  
    2323?> 
    2424<div id="democratic_playlist"> 

  • trunk/templates/show_random.inc.php

    r1692 r1699  
    4949                <select name="length"> 
    5050                        <option value="0"><?php echo _('Unlimited'); ?></option> 
    51                         <option value="15"><?php printf(ngettext('%s minute','%s minutes',15), "15"); ?></option> 
    52                         <option value="30"><?php printf(ngettext('%s minute','%s minutes',30), "30"); ?></option> 
    53                         <option value="60"><?php printf(ngettext('%s hour','%s hours',1), "1"); ?></option> 
    54                         <option value="120"><?php printf(ngettext('%s hour','%s hours',2), "2"); ?></option> 
    55                         <option value="240"><?php printf(ngettext('%s hour','%s hours',4), "4"); ?></option> 
    56                         <option value="480"><?php printf(ngettext('%s hour','%s hours',8), "8"); ?></option> 
    57                         <option value="960"><?php printf(ngettext('%s hour','%s hours',16), "16"); ?></option> 
     51                        <option value="15"><?php printf(ngettext('%d minute','%d minutes',15), "15"); ?></option> 
     52                        <option value="30"><?php printf(ngettext('%d minute','%d minutes',30), "30"); ?></option> 
     53                        <option value="60"><?php printf(ngettext('%d hour','%d hours',1), "1"); ?></option> 
     54                        <option value="120"><?php printf(ngettext('%d hour','%d hours',2), "2"); ?></option> 
     55                        <option value="240"><?php printf(ngettext('%d hour','%d hours',4), "4"); ?></option> 
     56                        <option value="480"><?php printf(ngettext('%d hour','%d hours',8), "8"); ?></option> 
     57                        <option value="960"><?php printf(ngettext('%d hour','%d hours',16), "16"); ?></option> 
    5858                </select> 
    5959        </td>