Changeset 492

Show
Ignore:
Timestamp:
01/25/08 16:03:58 (9 months ago)
Author:
kasper
Message:

Fix for installations, running together with Wordpress or other systems using Gettext.
Fixed som missing translations.
Fix for gallery remote, now working in beta3.

Location:
trunk
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • trunk/admin/plog-manage.php

    r424 r492  
    236236                        $output .= "<div style='float:right'><img src='$thumbpath'/></div>"; 
    237237                 
    238                         $output .= '<label accesskey="c" for="caption"><em>C</em>aption:</label><input size="80" name="caption" id="caption" value="'.SmartStripSlashes($photo['caption']).'"><br /> 
    239                                                         <label>Description:</label><br /> 
     238                        $output .= '<label accesskey="c" for="caption">' . plog_tr('<em>C</em>aption') . ':</label><input size="80" name="caption" id="caption" value="'.SmartStripSlashes($photo['caption']).'"><br /> 
     239                                                        <label>' . plog_tr('Description') . ':</label><br /> 
    240240                                                        <textarea name="description" id="description" cols="60" rows="5">'.SmartStripSlashes($photo['description']).'</textarea><br /> 
    241241                                                 
    242                                             <label for="allow_comments" accesskey="w">Allo<em>w</em> Comments?<label><br /><input type="checkbox" id="allow_comments" name="allow_comments" value="1"'." $state>"; 
     242                                            <label for="allow_comments" accesskey="w">' . plog_tr('Allo<em>w</em> Comments') . '?<label><br /><input type="checkbox" id="allow_comments" name="allow_comments" value="1"'." $state>"; 
    243243                                                 
    244244                        $output .= '<input type="hidden" name="pid" value="'.$photo['id'].'"><input type="hidden"  
    245                                                 name="action" value="update-picture"><button class="submit" type="submit">Update</button>'; 
     245                                                name="action" value="update-picture"><button class="submit" type="submit">' . plog_tr('Update') . '</button>'; 
    246246                         
    247247                        $output .= '</form>'; 

  • trunk/plog-globals.php

    r491 r492  
    2020 
    2121 
    22  
    23 require_once("lib/gettext/streams.php"); 
    24 require_once("lib/gettext/gettext.php"); 
     22if (!class_exists(streamreader)) { 
     23  require_once("lib/gettext/streams.php"); 
     24  require_once("lib/gettext/gettext.php"); 
     25} 
    2526 
    2627$locale = "en_US"; 

  • trunk/plog-remote.php

    r422 r492  
    1111require("plog-functions.php"); 
    1212require("plog-globals.php"); 
     13require_once("plog-load_config.php"); 
    1314include("admin/plog-admin-functions.php"); 
    1415