[Linpha-cvs] SF.net SVN: linpha: [4684] trunk/linpha2
Status: Inactive
Brought to you by:
bzrudi
From: <fan...@us...> - 2007-02-20 19:31:31
|
Revision: 4684 http://svn.sourceforge.net/linpha/?rev=4684&view=rev Author: fangehrn Date: 2007-02-20 11:31:26 -0800 (Tue, 20 Feb 2007) Log Message: ----------- 2007-02-20 flo * i18n - added check for outdated strings - there is no need for checking modified entries because every changed entries will cause a new entry ;-) - gone through all 928 i18n calls and fixed a lot... Modified Paths: -------------- trunk/linpha2/ChangeLog trunk/linpha2/admin/index.php trunk/linpha2/admin/maintenance.php trunk/linpha2/admin/metadata.php trunk/linpha2/admin/metadata_define.php trunk/linpha2/admin/metadata_select.php trunk/linpha2/admin/permissions.php trunk/linpha2/admin/permissions_others.php trunk/linpha2/admin/settings.php trunk/linpha2/admin/settings_features.php trunk/linpha2/admin/settings_layout.php trunk/linpha2/install/sql/sql.data.php trunk/linpha2/install/step2_requirements.php trunk/linpha2/lib/classes/linpha.admin.class.php trunk/linpha2/lib/classes/linpha.functions.php trunk/linpha2/lib/classes/linpha.imgview.class.php trunk/linpha2/lib/classes/linpha.import.class.php trunk/linpha2/lib/classes/linpha.metadata.class.php trunk/linpha2/lib/classes/linpha.template.class.php trunk/linpha2/lib/include/metadata_info_show.php trunk/linpha2/lib/lang/editlang.php trunk/linpha2/lib/modules/module.filemanager.php trunk/linpha2/templates/default/home.html.php Modified: trunk/linpha2/ChangeLog =================================================================== --- trunk/linpha2/ChangeLog 2007-02-18 23:23:43 UTC (rev 4683) +++ trunk/linpha2/ChangeLog 2007-02-20 19:31:26 UTC (rev 4684) @@ -1,4 +1,11 @@ +2007-02-20 flo + * i18n + - added check for outdated strings + - there is no need for checking modified entries + because every changed entries will cause a new entry ;-) + - gone through all 928 i18n calls and fixed a lot... + 2007-02-19 flo * finished i18n - admin config @@ -7,8 +14,6 @@ - editlang.php: update language files - installer: improved language support - @todo check for outdated entries, handle modified entries somehow - * .htaccess added .htaccess files to albums/ and var/ i thought they were already there...? Modified: trunk/linpha2/admin/index.php =================================================================== --- trunk/linpha2/admin/index.php 2007-02-18 23:23:43 UTC (rev 4683) +++ trunk/linpha2/admin/index.php 2007-02-20 19:31:26 UTC (rev 4684) @@ -65,12 +65,11 @@ ?> <?php -$array_menu = Array( - //'linpha_home' => Array('name' => 'Linpha Home', 'link' => 'linpha_home'), - 'settings' => Array('name' => 'Settings', 'link' => 'settings'), - 'permissions' => Array('name' => 'Permissions', 'link' => 'permissions'), - 'maintenance' => Array('name' => 'Maintenance', 'link' => 'maintenance'), - 'metadata' => Array('name' => 'MetaData', 'link' => 'metadata'), +$array_menu = array( + 'settings' => array('name' => i18n("Settings"), 'link' => 'settings'), + 'permissions' => array('name' => i18n("Permissions"), 'link' => 'permissions'), + 'maintenance' => array('name' => i18n("Maintenance"), 'link' => 'maintenance'), + 'metadata' => array('name' => i18n("MetaData"), 'link' => 'metadata'), ); LinAdmin::printAdminMenu($array_menu,$cat1); Modified: trunk/linpha2/admin/maintenance.php =================================================================== --- trunk/linpha2/admin/maintenance.php 2007-02-18 23:23:43 UTC (rev 4683) +++ trunk/linpha2/admin/maintenance.php 2007-02-20 19:31:26 UTC (rev 4684) @@ -6,9 +6,9 @@ $cat2 = 'import'; } -$array_menu = Array( - 'import' => Array('name' => 'Import', 'link' => 'maintenance_import'), - 'db' => Array('name' => 'Database', 'link' => 'maintenance_db'), +$array_menu = array( + 'import' => array('name' => i18n("Import"), 'link' => 'maintenance_import'), + 'db' => array('name' => i18n("Database"), 'link' => 'maintenance_db'), ); LinAdmin::printAdminMenu($array_menu,$cat2); Modified: trunk/linpha2/admin/metadata.php =================================================================== --- trunk/linpha2/admin/metadata.php 2007-02-18 23:23:43 UTC (rev 4683) +++ trunk/linpha2/admin/metadata.php 2007-02-20 19:31:26 UTC (rev 4684) @@ -33,9 +33,9 @@ $cat2 = 'select'; } -$array_menu = Array( - 'select' => Array('name' => 'Select image fields', 'link' => 'metadata_select'), - 'define' => Array('name' => 'Define image fields', 'link' => 'metadata_define') +$array_menu = array( + 'select' => array('name' => i18n("Select image fields"), 'link' => 'metadata_select'), + 'define' => array('name' => i18n("Define image fields"), 'link' => 'metadata_define') ); LinAdmin::printAdminMenu($array_menu,$cat2); Modified: trunk/linpha2/admin/metadata_define.php =================================================================== --- trunk/linpha2/admin/metadata_define.php 2007-02-18 23:23:43 UTC (rev 4683) +++ trunk/linpha2/admin/metadata_define.php 2007-02-20 19:31:26 UTC (rev 4684) @@ -44,12 +44,12 @@ /** * show subsubmenu */ - $array_menu = Array( - 'own' => Array('name' => 'Own fields', 'link' => 'metadata_define_own'), - 'adddata' => Array('name' => 'Add select data (set Category names)', 'link' => 'metadata_define_adddata'), - 'exif' => Array('name' => 'EXIF fields', 'link' => 'metadata_define_exif'), - 'iptc' => Array('name' => 'IPTC fields', 'link' => 'metadata_define_iptc'), - 'xmp' => Array('name' => 'XMP fields', 'link' => 'metadata_define_xmp') + $array_menu = array( + 'own' => array('name' => i18n("Own fields"), 'link' => 'metadata_define_own'), + 'adddata' => array('name' => i18n("Add select data (set Category names)"), 'link' => 'metadata_define_adddata'), + 'exif' => array('name' => i18n("EXIF fields"), 'link' => 'metadata_define_exif'), + 'iptc' => array('name' => i18n("IPTC fields"), 'link' => 'metadata_define_iptc'), + 'xmp' => array('name' => i18n("XMP fields"), 'link' => 'metadata_define_xmp') ); LinAdmin::printAdminMenu($array_menu,$cat3); @@ -70,30 +70,16 @@ show_add_data(); break; case 'exif': - echo i18n("EXIF data is usually created by the any Digital Camera. " . - "These values will be indexed for searching and displaying them, " . - "but can't be edited with LinPHA."); + echo i18n("EXIF data is usually created by the any Digital Camera. These values will be indexed for searching and displaying them, but can't be edited with LinPHA."); echo '<br />'; - echo i18n("Hint: You should't choose all available EXIF tags " . - "because the database table may get to large (MySQL) and therefore " . - "could result in an error."); + echo i18n("Hint: You should't choose all available EXIF tags because the database table may get to large (MySQL) and therefore could result in an error."); echo '<br /><br /><br />'; show_metadata(); break; case 'iptc': - echo i18n("IPTC data is usually not available by default. " . - "It needs to be filled up either with LinPHA, " . - "or with any external program which allows IPTC editing like Photoshop. " . - "IPTC is a standard within professional Photographer business."); - echo '<br /><br />'; - show_metadata(); - break; - case 'xmp': - echo i18n("XMP data is usually not available by default. " . - "It needs to be filled up either with LinPHA, " . - "or with any external program which allows XMP editing like Photoshop. " . - "XMP is standard within professional Photographer business."); + echo i18n("IPTC/XMP data is usually not available by default."); + echo i18n("It needs to be filled up either with LinPHA, or with any external program which allows IPTC/XMP editing like Photoshop. IPTC/XMP is a standard within professional Photographer business."); echo '<br /><br />'; show_metadata(); break; @@ -243,11 +229,11 @@ while($data = $query->FetchRow()) { ?> - <h3><?php echo i18n( ucfirst( $data['name'] ) ); ?></h3> + <h3><?php echo i18n( ucfirst($data['name']) ); /* already translated in sql.data.php */ ?></h3> <table border="0"> <tr> <td width="170"><b><?php echo i18n("Name"); ?></b></td> - <td width="150"><b><?php echo i18n("Private"); echo ' <span title="'.i18n("not visible in the search page by the normal user").'">(Info)</span>'; ?></b></td> + <td width="150"><b><?php echo i18n("Private"); echo ' <span title="'.i18n("Not visible in the search page by a normal user").'">'. i18n("Info").'</span>'; ?></b></td> <td><b>Commands</b></td> <td> </td> </tr> Modified: trunk/linpha2/admin/metadata_select.php =================================================================== --- trunk/linpha2/admin/metadata_select.php 2007-02-18 23:23:43 UTC (rev 4683) +++ trunk/linpha2/admin/metadata_select.php 2007-02-20 19:31:26 UTC (rev 4684) @@ -33,13 +33,13 @@ $cat3 = 'image'; } -$array_menu = Array( - 'image' => Array('name' => 'Image', 'link' => 'metadata_select_image'), - 'slideshow' => Array('name' => 'Slideshow', 'link' => 'metadata_select_slideshow'), - 'thumb' => Array('name' => 'Thumbnail', 'link' => 'metadata_select_thumb'), - 'thumbdetail' => Array('name' => 'Thumbnail Detail View', 'link' => 'metadata_select_thumbdetail'), - 'video' => Array('name' => 'Video', 'link' => 'metadata_select_video'), - 'album' => Array('name' => 'Album', 'link' => 'metadata_select_album') +$array_menu = array( + 'image' => array('name' => i18n("Image"), 'link' => 'metadata_select_image'), + 'slideshow' => array('name' => i18n("Slideshow"), 'link' => 'metadata_select_slideshow'), + 'thumb' => array('name' => i18n("Thumbnail"), 'link' => 'metadata_select_thumb'), + 'thumbdetail' => array('name' => i18n("Thumbnail Detail View"), 'link' => 'metadata_select_thumbdetail'), + 'video' => array('name' => i18n("Video"), 'link' => 'metadata_select_video'), + 'album' => array('name' => i18n("Album"), 'link' => 'metadata_select_album') ); LinAdmin::printAdminMenu($array_menu,$cat3); Modified: trunk/linpha2/admin/permissions.php =================================================================== --- trunk/linpha2/admin/permissions.php 2007-02-18 23:23:43 UTC (rev 4683) +++ trunk/linpha2/admin/permissions.php 2007-02-20 19:31:26 UTC (rev 4684) @@ -6,15 +6,15 @@ $cat2 = 'users'; } -$array_menu = Array( - 'users' => Array('name' => 'Users', 'link' => 'permissions_users'), - 'groups' => Array('name' => 'Groups', 'link' => 'permissions_groups'), - 'usergroup' => Array('name' => 'Group Memberships', 'link' => 'permissions_usergroup'), - 'view' => Array('name' => 'View', 'link' => 'permissions_view'), - 'write' => Array('name' => 'Write', 'link' => 'permissions_write'), - 'basket' => Array('name' => 'Basket', 'link' => 'permissions_basket'), - 'metadata' => Array('name' => 'MetaData', 'link' => 'permissions_metadata'), - 'others' => Array('name' => 'Others', 'link' => 'permissions_others'), +$array_menu = array( + 'users' => array('name' => i18n("Users"), 'link' => 'permissions_users'), + 'groups' => array('name' => i18n("Groups"), 'link' => 'permissions_groups'), + 'usergroup' => array('name' => i18n("Group Memberships"), 'link' => 'permissions_usergroup'), + 'view' => array('name' => i18n("View"), 'link' => 'permissions_view'), + 'write' => array('name' => i18n("Write"), 'link' => 'permissions_write'), + 'basket' => array('name' => i18n("Basket"), 'link' => 'permissions_basket'), + 'metadata' => array('name' => i18n("MetaData"), 'link' => 'permissions_metadata'), + 'others' => array('name' => i18n("Others"), 'link' => 'permissions_others'), ); LinAdmin::printAdminMenu($array_menu,$cat2); Modified: trunk/linpha2/admin/permissions_others.php =================================================================== --- trunk/linpha2/admin/permissions_others.php 2007-02-18 23:23:43 UTC (rev 4683) +++ trunk/linpha2/admin/permissions_others.php 2007-02-20 19:31:26 UTC (rev 4684) @@ -10,23 +10,23 @@ { case 'basket': $array_menu = array( - 'print' => Array('name' => "Print", 'link' => 'permissions_basket_print'), - 'mail' => Array('name' => "Mail", 'link' => 'permissions_basket_mail'), - 'download' => Array('name' => "Download", 'link' => 'permissions_basket_download'), + 'print' => array('name' => i18n("Print"), 'link' => 'permissions_basket_print'), + 'mail' => array('name' => i18n("Mail"), 'link' => 'permissions_basket_mail'), + 'download' => array('name' => i18n("Download"), 'link' => 'permissions_basket_download'), ); break; case 'metadata': $array_menu = array( - 'comments' => Array('name' => "Write Comments", 'link' => 'permissions_metadata_comments'), - 'deletecomments' => Array('name' => "Delete Comments", 'link' => 'permissions_metadata_deletecomments'), - 'edit' => Array('name' => "Edit Image Informations", 'link' => 'permissions_metadata_edit'), + 'comments' => array('name' => i18n("Write Comments"), 'link' => 'permissions_metadata_comments'), + 'deletecomments' => array('name' => i18n("Delete Comments"), 'link' => 'permissions_metadata_deletecomments'), + 'edit' => array('name' => i18n("Edit Image Informations"), 'link' => 'permissions_metadata_edit'), ); break; case 'others': $array_menu = array( - 'watermark' => Array('name' => "Watermark", 'link' => 'permissions_others_watermark'), - 'stats' => Array('name' => "Statistics", 'link' => 'permissions_others_stats'), - 'download' => Array('name' => "Download", 'link' => 'permissions_others_download'), + 'watermark' => array('name' => i18n("Watermark"), 'link' => 'permissions_others_watermark'), + 'stats' => array('name' => i18n("Statistics"), 'link' => 'permissions_others_stats'), + 'download' => array('name' => i18n("Download"), 'link' => 'permissions_others_download'), ); break; } @@ -73,7 +73,7 @@ } - echo '<b>'.i18n("Edit").': '.i18n($array_menu[$cat3]['name']).'</b><br />'; + echo '<b>'.i18n("Edit").': '.$array_menu[$cat3]['name'].'</b><br />'; $data = $GLOBALS['linpha']->db->GetRow("SELECT permission FROM ".LIN_PREFIX."permissions " . "WHERE perm_type = '".LinSql::linAddslashes($key)."'"); Modified: trunk/linpha2/admin/settings.php =================================================================== --- trunk/linpha2/admin/settings.php 2007-02-18 23:23:43 UTC (rev 4683) +++ trunk/linpha2/admin/settings.php 2007-02-20 19:31:26 UTC (rev 4684) @@ -6,11 +6,11 @@ $cat2 = 'layout'; } -$array_menu = Array( - 'layout' => Array('name' => 'Layout', 'link' => 'settings_layout'), - 'features' => Array('name' => 'Features', 'link' => 'settings_features'), - 'others' => Array('name' => 'Others', 'link' => 'settings_others'), - 'all' => Array('name' => 'All', 'link' => 'settings_all') +$array_menu = array( + 'layout' => array('name' => i18n("Layout"), 'link' => 'settings_layout'), + 'features' => array('name' => i18n("Features"), 'link' => 'settings_features'), + 'others' => array('name' => i18n("Others"), 'link' => 'settings_others'), + 'all' => array('name' => i18n("All"), 'link' => 'settings_all') ); LinAdmin::printAdminMenu($array_menu,$cat2); Modified: trunk/linpha2/admin/settings_features.php =================================================================== --- trunk/linpha2/admin/settings_features.php 2007-02-18 23:23:43 UTC (rev 4683) +++ trunk/linpha2/admin/settings_features.php 2007-02-20 19:31:26 UTC (rev 4684) @@ -6,9 +6,9 @@ $cat3 = 'others'; } -$array_menu = Array( - 'log' => Array('name' => 'Logging', 'link' => 'settings_features_log'), - 'others' => Array('name' => 'Others', 'link' => 'settings_features_others'), +$array_menu = array( + 'log' => array('name' => i18n("Logging"), 'link' => 'settings_features_log'), + 'others' => array('name' => i18n("Others"), 'link' => 'settings_features_others'), ); LinAdmin::printAdminMenu($array_menu,$cat3); @@ -47,7 +47,7 @@ $LinAdmin->printAdminConfig('radio',$LinAdmin->getDescriptionByOptionName('plugins_log_syslog_enable'),'plugins_log_syslog_enable',$LinAdmin->option_value_system['plugins_log_syslog_enable']); $LinAdmin->printAdminConfig('text',$LinAdmin->getDescriptionByOptionName('plugins_log_syslog_add_events'),'plugins_log_syslog_add_events',$LinAdmin->option_value_system['plugins_log_syslog_add_events']); - echo i18n("Comma separated list. Valid events: login, logout, rotate, comments, guestbook, fm_others, fm_upload, fm_delete, fm_move, fm_copy, fm_rename, fm_create_folder, fm_perm"); + echo i18n("Comma separated list. Valid events:")." login, logout, rotate, comments, guestbook, fm_others, fm_upload, fm_delete, fm_move, fm_copy, fm_rename, fm_create_folder, fm_perm"; echo '<br />'; echo '<br /><h2 class="linStyle">'.i18n("Email").'</h2>'; @@ -57,7 +57,7 @@ $LinAdmin->printAdminConfig('text',$LinAdmin->getDescriptionByOptionName('plugins_log_email_headers'),'plugins_log_email_headers',$LinAdmin->option_value_system['plugins_log_email_headers']); $LinAdmin->printAdminConfig('text',$LinAdmin->getDescriptionByOptionName('plugins_log_email_add_events'),'plugins_log_email_add_events',$LinAdmin->option_value_system['plugins_log_email_add_events']); - echo i18n("Comma separated list. Valid events: login, logout, rotate, comments, guestbook, fm_others, fm_upload, fm_delete, fm_move, fm_copy, fm_rename, fm_create_folder, fm_perm"); + echo i18n("Comma separated list. Valid events:")." login, logout, rotate, comments, guestbook, fm_others, fm_upload, fm_delete, fm_move, fm_copy, fm_rename, fm_create_folder, fm_perm"; break; Modified: trunk/linpha2/admin/settings_layout.php =================================================================== --- trunk/linpha2/admin/settings_layout.php 2007-02-18 23:23:43 UTC (rev 4683) +++ trunk/linpha2/admin/settings_layout.php 2007-02-20 19:31:26 UTC (rev 4684) @@ -6,12 +6,12 @@ $cat3 = 'general'; } -$array_menu = Array( - 'general' => Array('name' => 'General', 'link' => 'settings_layout_general'), - 'home' => Array('name' => 'Home Site', 'link' => 'settings_layout_home'), - 'thumb' => Array('name' => 'Thumb View', 'link' => 'settings_layout_thumb'), - 'image' => Array('name' => 'Image View', 'link' => 'settings_layout_image'), - 'others' => Array('name' => 'Others', 'link' => 'settings_layout_others') +$array_menu = array( + 'general' => array('name' => i18n("General"), 'link' => 'settings_layout_general'), + 'home' => array('name' => i18n("Home Site"), 'link' => 'settings_layout_home'), + 'thumb' => array('name' => i18n("Thumb View"), 'link' => 'settings_layout_thumb'), + 'image' => array('name' => i18n("Image View"), 'link' => 'settings_layout_image'), + 'others' => array('name' => i18n("Others"), 'link' => 'settings_layout_others') ); LinAdmin::printAdminMenu($array_menu,$cat3); Modified: trunk/linpha2/install/sql/sql.data.php =================================================================== --- trunk/linpha2/install/sql/sql.data.php 2007-02-18 23:23:43 UTC (rev 4683) +++ trunk/linpha2/install/sql/sql.data.php 2007-02-20 19:31:26 UTC (rev 4684) @@ -213,6 +213,12 @@ $sql_queries[] = "INSERT INTO ".LIN_PREFIX."meta_fields " . "(name, field_type, flags) VALUES ('first_comment', 0, 1)"; + /** + * workaround for i18n + * they wouldn't get detected otherwise... + * some are defined in linpha.metadata.php + */ + i18n("Filename"); i18n("Imagesize"); i18n("Dimension"); i18n("Thumbnail"); /** @@ -227,7 +233,14 @@ "(name, field_type, flags) VALUES ('persons', 2, 5)"; $sql_queries[] = "INSERT INTO ".LIN_PREFIX."meta_fields " . "(name, field_type, flags) VALUES ('date', 3, 5)"; + /** + * workaround for i18n + * they wouldn't get detected otherwise... + * some are defined in linpha.metadata.php + */ + i18n("Description"); i18n("Category"); i18n("Persons"); i18n("Date"); + /** * image fields * flag_nr 10 Modified: trunk/linpha2/install/step2_requirements.php =================================================================== --- trunk/linpha2/install/step2_requirements.php 2007-02-18 23:23:43 UTC (rev 4683) +++ trunk/linpha2/install/step2_requirements.php 2007-02-20 19:31:26 UTC (rev 4684) @@ -76,7 +76,7 @@ else { print_line_right(failed_msg()); - print_line_info( i18n_install("PHP Version >= 5.0.0 is required") ); + print_line_info( sprintf(i18n_install("PHP Version >= %s is required"),'5.0.0') ); $error = 1; } Modified: trunk/linpha2/lib/classes/linpha.admin.class.php =================================================================== --- trunk/linpha2/lib/classes/linpha.admin.class.php 2007-02-18 23:23:43 UTC (rev 4683) +++ trunk/linpha2/lib/classes/linpha.admin.class.php 2007-02-20 19:31:26 UTC (rev 4684) @@ -99,17 +99,17 @@ { if($value['link']=='linpha_home') { - echo '<li><a href="../">'.i18n($value['name']).'</a></li>'; + echo '<li><a href="../">'.$value['name'].'</a></li>'; } else { if($active==$key) { - echo '<li><a href="./?cat='.$value['link'].'" class="current">'.i18n($value['name']).'</a></li>'; + echo '<li><a href="./?cat='.$value['link'].'" class="current">'.$value['name'].'</a></li>'; } else { - echo '<li><a href="./?cat='.$value['link'].'">'.i18n($value['name']).'</a></li>'; + echo '<li><a href="./?cat='.$value['link'].'">'.$value['name'].'</a></li>'; } } } Modified: trunk/linpha2/lib/classes/linpha.functions.php =================================================================== --- trunk/linpha2/lib/classes/linpha.functions.php 2007-02-18 23:23:43 UTC (rev 4683) +++ trunk/linpha2/lib/classes/linpha.functions.php 2007-02-20 19:31:26 UTC (rev 4684) @@ -413,10 +413,10 @@ /** * if making any changes in these arrays, all language files needs updating */ - $arr_month_short = Array('1' => i18n('Jan'),'2' => i18n('Feb'),'3' => i18n('Mar'),'4' => i18n('Apr'),'5' => i18n('May'),'6' => i18n('Jun'),'7' => i18n('Jul'),'8' => i18n('Aug'),'9' => i18n('Sep'),'10' => i18n('Oct'),'11' => i18n('Nov'),'12' => i18n('Dec')); /* abrevations of months */ - $arr_month_long = Array('1' => i18n('January'),'2' => i18n('February'),'3' => i18n('March'),'4' => i18n('April'),'5' => i18n('May'),'6' => i18n('June'),'7' => i18n('July'),'8' => i18n('August'),'9' => i18n('September'),'10' => i18n('October'),'11' => i18n('November'),'12' => i18n('December')); /* months */ - $arr_day_short = Array(i18n('Sun'),i18n('Mon'),i18n('Tue'),i18n('Wed'),i18n('Thu'),i18n('Fri'),i18n('Sat')); /* abrevations of weekdays */ - $arr_day_long = Array(i18n('Sunday'),i18n('Monday'),i18n('Tuesday'),i18n('Wednesday'),i18n('Thursday'),i18n('Friday'),i18n('Saturday')); /* weekdays */ + $arr_month_short = Array('1' => i18n("Jan"),'2' => i18n("Feb"),'3' => i18n("Mar"),'4' => i18n("Apr"),'5' => i18n("May"),'6' => i18n("Jun"),'7' => i18n("Jul"),'8' => i18n("Aug"),'9' => i18n("Sep"),'10' => i18n("Oct"),'11' => i18n("Nov"),'12' => i18n("Dec")); /* abrevations of months */ + $arr_month_long = Array('1' => i18n("January"),'2' => i18n("February"),'3' => i18n("March"),'4' => i18n("April"),'5' => i18n("May"),'6' => i18n("June"),'7' => i18n("July"),'8' => i18n("August"),'9' => i18n("September"),'10' => i18n("October"),'11' => i18n("November"),'12' => i18n("December")); /* months */ + $arr_day_short = Array(i18n("Sun"),i18n("Mon"),i18n("Tue"),i18n("Wed"),i18n("Thu"),i18n("Fri"),i18n("Sat")); /* abrevations of weekdays */ + $arr_day_long = Array(i18n("Sunday"),i18n("Monday"),i18n("Tuesday"),i18n("Wednesday"),i18n("Thursday"),i18n("Friday"),i18n("Saturday")); /* weekdays */ if(empty($str_format)) { $str_format = linGetDateFormat().' '.linGetTimeFormat(); @@ -459,10 +459,10 @@ */ function linGetDateFormat() { - if( i18n('special_date_format') == 'special_date_format') { + if( i18n("special_date_format") == 'special_date_format') { return $GLOBALS['linpha']->sql->config->value['sys_style_datetime_dates']; } else { - return i18n('special_date_format'); + return i18n("special_date_format"); } } @@ -477,10 +477,10 @@ */ function linGetTimeFormat() { - if( i18n('special_time_format') == 'special_time_format') { + if( i18n("special_time_format") == 'special_time_format') { return $GLOBALS['linpha']->sql->config->value['sys_style_datetime_times']; } else { - return i18n('special_time_format'); + return i18n("special_time_format"); } } Modified: trunk/linpha2/lib/classes/linpha.imgview.class.php =================================================================== --- trunk/linpha2/lib/classes/linpha.imgview.class.php 2007-02-18 23:23:43 UTC (rev 4683) +++ trunk/linpha2/lib/classes/linpha.imgview.class.php 2007-02-20 19:31:26 UTC (rev 4684) @@ -329,9 +329,9 @@ * more than one time used stuff */ $array = linGetSortOrders(); - foreach($array AS $value) + foreach($array AS $value) // i18n() already called { - $array_sort_orders_links[] = array('name' => i18n($value), 'value' => $GLOBALS['linpha']->template->URL_full.'&order_by='.$value); + $array_sort_orders_links[] = array('name' => $value, 'value' => $GLOBALS['linpha']->template->URL_full.'&order_by='.$value); } $open_basket_link = LINPHA_LINK.'&linCat=basket'; @@ -909,8 +909,7 @@ if($GLOBALS['linpha']->sql->config->value['sys_style_home_usedefaultwelcometext']) { $GLOBALS['linpha']->template->output['welcome'] = '<h1 class="linStyle">'.i18n("Welcome").'</h1>'. - i18n("Hi, this is the home of \"The PHP Photo Archive\" " . - "<a href=\"http://linpha.sf.net\">aka LinPHA</a>.").'<br />'; + i18n("Hi, this is the home of \"The PHP Photo Archive\" <a href=\"http://linpha.sf.net\">aka LinPHA</a>.").'<br />'; } else { @@ -1235,7 +1234,7 @@ if($this->newCommentAdded) { - echo '<commentadded>'.i18n('Comment successfully added.').'</commentadded>'."\n"; + echo '<commentadded>'.i18n("Comment successfully added.").'</commentadded>'."\n"; } while($data = $GLOBALS['linpha']->template->output['image_comments']->FetchRow()) Modified: trunk/linpha2/lib/classes/linpha.import.class.php =================================================================== --- trunk/linpha2/lib/classes/linpha.import.class.php 2007-02-18 23:23:43 UTC (rev 4683) +++ trunk/linpha2/lib/classes/linpha.import.class.php 2007-02-20 19:31:26 UTC (rev 4684) @@ -494,7 +494,7 @@ } } } - else + else // this should not happen { linSysLog(i18n("Import").': Error: what am i? '.htmlspecialchars($dirname.'/'.$filename,ENT_QUOTES)); linLog(LOG_TYPE_IMPORT,LOG_NOTICE,'import_fileinfo','Error: what am i? '.htmlspecialchars($dirname.'/'.$filename,ENT_QUOTES)); Modified: trunk/linpha2/lib/classes/linpha.metadata.class.php =================================================================== --- trunk/linpha2/lib/classes/linpha.metadata.class.php 2007-02-18 23:23:43 UTC (rev 4683) +++ trunk/linpha2/lib/classes/linpha.metadata.class.php 2007-02-20 19:31:26 UTC (rev 4684) @@ -974,7 +974,7 @@ /** * echo "Error - Failure update Photoshop File Info : $filename <br>\n"; */ - linSysLog(i18n("Error: Failure update Photoshop File Info:" . ' ' . $filename)); + linSysLog(i18n("Error: Failure update Photoshop File Info:") . ' ' . $filename); linLog(LOG_TYPE_META, LOG_ERR, 'meta_iptc', "Error: Failure update Photoshop File Info:" . ' ' . $filename); return false; @@ -985,13 +985,13 @@ /** * echo "Error - Failure to write new JPEG : $filename <br>\n"; */ - linSysLog(i18n("Error: Failure to write new JPEG:" . ' ' . $filename)); + linSysLog(i18n("Error: Failure to write new JPEG:") . ' ' . $filename); linLog(LOG_TYPE_META, LOG_ERR, 'meta_iptc', "Error: Failure to write new JPEG:" . ' ' . $filename); return false; } else { // Writing of new JPEG succeeded - linSysLog(i18n("DONE! Updated:" . ' ' . $filename)); + linSysLog(i18n("DONE! Updated:") . ' ' . $filename); linLog(LOG_TYPE_META, LOG_NOTICE, 'meta_iptc', "Updated:" . ' ' . $filename); return true; @@ -2094,7 +2094,7 @@ $last_part = substr($key, $pos +1); switch ($first_part) { case 'builtin' : // builtin and special fields like filename, imagesize and dimension - $value = i18n(ucfirst($last_part)); + $value = i18n(ucfirst($last_part)); // i18n already called in sql.data.php break; case 'id' : // own fields @@ -2104,10 +2104,10 @@ * we dont want have to read this for each thumbnail */ if (isset ($this->cachedFieldNames[$last_part])) { - $value = i18n(ucfirst($this->cachedFieldNames[$last_part])); + $value = i18n(ucfirst($this->cachedFieldNames[$last_part])); // i18n already called in sql.data.php } else { $data = $GLOBALS['linpha']->db->GetRow("SELECT name FROM " . LIN_PREFIX . "meta_fields WHERE id = '" . $last_part . "'"); - $value = i18n(ucfirst($data['name'])); + $value = i18n(ucfirst($data['name'])); // i18n already called in sql.data.php if (isset ($this)) // cache entry, but only in object context { Modified: trunk/linpha2/lib/classes/linpha.template.class.php =================================================================== --- trunk/linpha2/lib/classes/linpha.template.class.php 2007-02-18 23:23:43 UTC (rev 4683) +++ trunk/linpha2/lib/classes/linpha.template.class.php 2007-02-20 19:31:26 UTC (rev 4684) @@ -193,13 +193,13 @@ case 'settings': if($GLOBALS['linpha']->sql->isLoggedIn()) { echo '<!-- my settings -->'."\n"; - $this->printMenu("My Settings",LINPHA_LINK."&linCat=settings"); + $this->printMenu("My Settings",i18n("My Settings"),LINPHA_LINK."&linCat=settings"); } break; case 'admin': if($GLOBALS['linpha']->sql->isLoggedIn()) { echo '<!-- admin links -->'."\n"; - $this->printMenu("Admin",LINPHA_CLIENT."/admin/"); + $this->printMenu("Admin",i18n("Admin"),LINPHA_CLIENT."/admin/"); } break; default: // all other, like home, search, login, guestbook, icons, more @@ -218,12 +218,12 @@ /** * print the main menu entries (more, admin, ...) */ - function printMenu($index,$link='') + function printMenu($index,$text,$link='') { if( ! isset( $GLOBALS['linpha']->template->output['menu_'.$index] ) ) { echo "\n".'<ul>'."\n"; - echo "\t".'<li><a href="'.$link.'">'.i18n($index).'</a>'."\n"; + echo "\t".'<li><a href="'.$link.'">'.$text.'</a>'."\n"; echo "\n".'</ul>'."\n"; } else @@ -231,11 +231,11 @@ echo "\n".'<ul>'."\n"; if(!empty($link)) { - echo "\t".'<li><a href="'.$link.'">'.i18n($index).'</a>'."\n"; + echo "\t".'<li><a href="'.$link.'">'.$text.'</a>'."\n"; } else { - echo "\t".'<li><span>'.i18n($index).' </span>'."\n"; + echo "\t".'<li><span>'.$text.' </span>'."\n"; } echo "\n".'<ul id="linMenu'.$index.'" onmouseover="myLinGlobal.reloadMenu()">'."\n"; Modified: trunk/linpha2/lib/include/metadata_info_show.php =================================================================== --- trunk/linpha2/lib/include/metadata_info_show.php 2007-02-18 23:23:43 UTC (rev 4683) +++ trunk/linpha2/lib/include/metadata_info_show.php 2007-02-20 19:31:26 UTC (rev 4684) @@ -6,9 +6,6 @@ */ if( !LinSql::photoIsAllowed( $GLOBALS['linpha']->template->idCurrent, $sql_perm_type = 'read' ) ) { - /** - * @todo use unified i18n STR_ACCESS_DENIED - */ echo i18n("Access Denied!"); exit(); } @@ -23,9 +20,6 @@ if( ! isset($data['id']) ) { - /** - * @todo use unified i18n STR_ACCESS_DENIED - */ echo i18n("Access Denied!"); exit(); } Modified: trunk/linpha2/lib/lang/editlang.php =================================================================== --- trunk/linpha2/lib/lang/editlang.php 2007-02-18 23:23:43 UTC (rev 4683) +++ trunk/linpha2/lib/lang/editlang.php 2007-02-20 19:31:26 UTC (rev 4684) @@ -17,12 +17,6 @@ $linpha = new Linpha(); $linpha->sql->startSession(); - if( ! $GLOBALS['linpha']->sql->isAdmin() ) - { - echo i18n("Access denied!"); - exit(); - } - /** * some defines */ @@ -39,6 +33,12 @@ ob_start(); +if( ! $GLOBALS['linpha']->sql->isAdmin() ) +{ + echo i18n("Access denied!"); +} +else +{ ?> <div style="float: left; width: 500px;"> <h2>LinPHA language files</h2> @@ -49,8 +49,8 @@ <form method="POST" action="<?php echo LINPHA_LINK.'&linCat=updatefile'; ?>"> <select name="languageFile"> <?php -$languageFiles = linGetAvailableLanguageFiles( $languagefilePaths['default'] ); -foreach($languageFiles as $key=>$value) +$languageFilesDefault = linGetAvailableLanguageFiles( $languagefilePaths['default'] ); +foreach($languageFilesDefault as $key=>$value) { echo '<option value="'.$value.'">'.$value.'</option>'; } @@ -69,8 +69,8 @@ <form method="POST" action="<?php echo LINPHA_LINK.'&linCat=updatefile&isInstaller=true'; ?>"> <select name="languageFile"> <?php -$languageFiles = linGetAvailableLanguageFiles( $languagefilePaths['installer'] ); -foreach($languageFiles as $key=>$value) +$languageFilesInstaller = linGetAvailableLanguageFiles( $languagefilePaths['installer'] ); +foreach($languageFilesInstaller as $key=>$value) { echo '<option value="'.$value.'">'.$value.'</option>'; } @@ -80,6 +80,9 @@ </form> </div> <div style="clear: both;"></div> +Please see <a href="http://linpha.sourceforge.net/wiki/index.php/Translator_Instructions">http://linpha.sourceforge.net/wiki/index.php/Translator_Instructions</a> +for instructions how to update the language files. +<br /><br /><br /> <?php if(isset($_GET['linCat'])) @@ -112,7 +115,7 @@ foreach($filelist as $file) { - echo '<br /><br /><b>'.$file.'</b><br />'; + echo '<br /><br /><b>'.str_replace( LINPHA_DIR.'/', '', $file).'</b><br />'; $i18nStrs = array(); scanFile($file, $languageFunction); @@ -125,6 +128,58 @@ break; case 'checkoutdated': + + $filelist = array(); + scanRecursive(LINPHA_DIR); + + $i18nStrs = array(); + foreach($filelist as $file) + { + scanFile($file, $languageFunction); + } + + if( isset($_GET['isInstaller']) ) { + $languageFiles = linGetAvailableLanguageFiles( $languagefilePaths['installer'] ); + } else { + $languageFiles = linGetAvailableLanguageFiles( $languagefilePaths['default'] ); + } + + foreach( $languageFiles as $key=>$value) + { + $languagefile = $languagefileFolder.'/lang.'.$value.'.php'; + + echo '<h2 class="linStyle">Parsing '.str_replace( LINPHA_DIR.'/', '', $languagefile).'</h2>'; + + if( !file_exists( $languagefile )) + { + echo "Error: File does not exists: ".$languagefile; // this should not happen + } + else + { + $linTranslate = array(); // after this command it is not recommended to use i18n() again + include( $languagefile ); + + foreach( $linTranslate as $key=>$value ) + { + if( !in_array( $key, $i18nStrs )) + { + echo htmlspecialchars("$key => $value", ENT_QUOTES).'<br />'; + $found = true; + } + } + if( isset($found) ) + { + echo '<br /><b>There are out-dated files, you should remove them from the language file.</b><br />'; + } + else + { + echo 'No out-dated entries found!<br />'; + } + } + + echo '<br /><br />'; + } + break; case 'updatefile': @@ -145,14 +200,14 @@ echo "Error"; // this should not happen } - $translate = array(); // after this command it is not recommended to use i18n() again + $linTranslate = array(); // after this command it is not recommended to use i18n() again include( $languagefile ); - echo '<br /><br />---------------------------------------<br />'; + echo '---------------------------------------<br />'; foreach( array_count_values($i18nStrs) as $key=>$value ) { - if( !isset($translate[$key]) ) + if( !isset($linTranslate[$key]) ) { echo '"'.htmlspecialchars($key, ENT_QUOTES).'" => "",<br />'; } @@ -162,9 +217,10 @@ break; -} // end switch() -} // end if +} // end switch($_GET['linCat']) +} // end if(isset($_GET['linCat'])) +} // end if( isAdmin ) ?> Modified: trunk/linpha2/lib/modules/module.filemanager.php =================================================================== --- trunk/linpha2/lib/modules/module.filemanager.php 2007-02-18 23:23:43 UTC (rev 4683) +++ trunk/linpha2/lib/modules/module.filemanager.php 2007-02-20 19:31:26 UTC (rev 4684) @@ -48,12 +48,11 @@ /** * some double used i18n entries - * @todo what should we do with double used entries?? */ - $str_checkpermissions = "Check the permissions in the linpha albums folder. (This means NOT the write permissions page in the admin section)"; - $str_autoimportdisabled = "Autoimport is disabled, you need now to start the manual import to make your changes appear, but you maybe don't have permissions to do that..."; - $str_nopermission = "You don't have permissions to this folder!"; - $str_filealreadyexists = "A File/Folder with the same name already exists!"; + $str_checkpermissions = i18n("Check the permissions in the linpha albums folder. (This means NOT the write permissions page in the admin section)"); + $str_autoimportdisabled = i18n("Autoimport is disabled, you need now to start the manual import to make your changes appear, but you maybe don't have permissions to do that..."); + $str_nopermission = i18n("You don't have permissions to this folder!"); + $str_filealreadyexists = i18n("A File/Folder with the same name already exists!"); /** * init stuff @@ -288,19 +287,19 @@ "WHERE id = '".LinSql::linAddslashes($_POST['file_id'])."'"); if( ! $linpha->sql->photoIsAllowed( $data['parent_id'], 'write') ) { - throw new Exception(i18n($str_nopermission)); + throw new Exception($str_nopermission); } if( nameAlreadyExists( $new_name, $data['parent_id'] )) { - throw new Exception(i18n($str_filealreadyexists)); + throw new Exception($str_filealreadyexists); } if( ! @rename( $full_filename , $parent_dirname."/".$new_name ) ) { throw new Exception(i18n("Rename File/Folder Failed!"). htmlspecialchars($full_filename,ENT_QUOTES).' '.i18n("to").' '.htmlspecialchars($parent_dirname.'/'.$new_name,ENT_QUOTES). - LIN_NL.i18n($str_checkpermissions) + LIN_NL.$str_checkpermissions ); } @@ -323,7 +322,7 @@ */ if( ! $linpha->sql->photoIsAllowed( $_POST['movecopy_to'], 'write') ) { - throw new Exception(i18n($str_nopermission)); + throw new Exception($str_nopermission); } /** @@ -346,8 +345,7 @@ i18n("Cannot Copy/Move to Folder \"%s\" because its not writable!"), htmlspecialchars($full_destparentname,ENT_QUOTES) ). - LIN_NL. - i18n($str_checkpermissions) + LIN_NL.$str_checkpermissions ); } @@ -373,7 +371,7 @@ */ if( ! $linpha->sql->photoIsAllowed( $value, 'read') ) { - throw new Exception(i18n($str_nopermission)); + throw new Exception($str_nopermission); } /** @@ -381,7 +379,7 @@ */ if( nameAlreadyExists( basename($full_sourcename), $_POST['movecopy_to'] )) { - throw new Exception(i18n($str_filealreadyexists)); + throw new Exception($str_filealreadyexists); } /** @@ -398,7 +396,7 @@ { if( ! $linpha->sql->photoIsAllowed( $data['parent_id'], 'write') ) { - throw new Exception(i18n($str_nopermission)); + throw new Exception($str_nopermission); } } @@ -411,7 +409,7 @@ htmlspecialchars($full_destparentname.'/'.basename($full_sourcename),ENT_QUOTES) ) ); - linSysLog(i18n($str_checkpermissions)); + linSysLog($str_checkpermissions); linLog(LOG_TYPE_FILEMANAGER,LOG_ERR,'fm_move',"cannot moved file/folder (".$full_sourcename." to ".$full_destparentname.'/'.basename($full_sourcename).")"); } @@ -451,7 +449,7 @@ htmlspecialchars($full_destparentname.'/'.basename($full_sourcename),ENT_QUOTES) ) ); - linSysLog(i18n($str_checkpermissions)); + linSysLog($str_checkpermissions); linLog(LOG_TYPE_FILEMANAGER,LOG_ERR,'fm_copy',"Cannot copy file/folder (".$full_sourcename." to ".$full_destparentname.'/'.basename($full_sourcename).")"); } @@ -494,7 +492,7 @@ */ if( ! $linpha->sql->photoIsAllowed( $data['parent_id'], 'write') ) { - throw new Exception(i18n($str_nopermission)); + throw new Exception($str_nopermission); } $full_filename = LinSql::getFullImagePath( $value ); @@ -508,7 +506,7 @@ if(file_exists($full_filename)) { - throw new Exception(i18n("Deleting Files/Folders Failed").": \"".htmlspecialchars($full_filename,ENT_QUOTES)."\"".LIN_NL.i18n($str_checkpermissions)); + throw new Exception(i18n("Deleting Files/Folders Failed").": \"".htmlspecialchars($full_filename,ENT_QUOTES)."\"".LIN_NL.$str_checkpermissions); } linSysLog(i18n("File/Folder deleted successfully!")); @@ -524,14 +522,14 @@ */ if( ! $linpha->sql->photoIsAllowed( $linpha->template->idCurrent, 'write') ) { - throw new Exception(i18n($str_nopermission)); + throw new Exception($str_nopermission); } $new_name = removeUnWantedChars( $_POST['folder_name'] ); if( nameAlreadyExists( $new_name, $linpha->template->idCurrent )) { - throw new Exception(i18n($str_filealreadyexists)); + throw new Exception($str_filealreadyexists); } $full_filename = LinSql::getFullImagePath( $linpha->template->idCurrent ); @@ -547,7 +545,7 @@ } elseif(! @mkdir( $full_filename .'/'. $new_name ) ) { - throw new Exception(i18n("Create Folder Failed").": \"".htmlspecialchars($new_name,ENT_QUOTES)."\"".LIN_NL.i18n($str_checkpermissions)); + throw new Exception(i18n("Create Folder Failed").": \"".htmlspecialchars($new_name,ENT_QUOTES)."\"".LIN_NL.$str_checkpermissions); } linLog(LOG_TYPE_FILEMANAGER,LOG_NOTICE,'fm_create_folder',"Created folder (".$full_filename.'/'.$new_name.")"); @@ -555,7 +553,7 @@ if( ! $linpha->sql->config->value['sys_import_autoimport'] ) { - linSysLog(i18n($str_autoimportdisabled)); + linSysLog($str_autoimportdisabled); } break; @@ -585,7 +583,7 @@ if(! @chmod($full_filename,intval($mode,8))) { - throw new Exception(i18n("Change Permissions Failed").": \"".htmlspecialchars($full_filename,ENT_QUOTES)."\" to ".$mode.LIN_NL.i18n($str_checkpermissions)); + throw new Exception(i18n("Change Permissions Failed").": \"".htmlspecialchars($full_filename,ENT_QUOTES)."\" to ".$mode.LIN_NL.$str_checkpermissions); } linSysLog(i18n("Permissions Changed Successfully!")); @@ -619,7 +617,7 @@ htmlspecialchars($thisfile['name'],ENT_QUOTES), ini_get('upload_max_filesize') ) ); break; case 2: - throw new Exception( sprintf(i18n("size of uploaded file %s exceeds the HTML FORM settings"), htmlspecialchars($thisfile['name'],ENT_QUOTES) ) ); + throw new Exception( sprintf(i18n("Error: Size of uploaded file %s exceeds the HTML FORM settings"), htmlspecialchars($thisfile['name'],ENT_QUOTES) ) ); break; case 3: throw new Exception( sprintf(i18n("The uploaded file %s was only partially uploaded"), htmlspecialchars($thisfile['name'],ENT_QUOTES) ) ); @@ -699,7 +697,7 @@ { if( ! $linpha->sql->config->value['sys_import_autoimport'] ) { - linSysLog(i18n($str_autoimportdisabled)); + linSysLog($str_autoimportdisabled); } } break; Modified: trunk/linpha2/templates/default/home.html.php =================================================================== --- trunk/linpha2/templates/default/home.html.php 2007-02-18 23:23:43 UTC (rev 4683) +++ trunk/linpha2/templates/default/home.html.php 2007-02-20 19:31:26 UTC (rev 4684) @@ -46,7 +46,7 @@ } ?> <div style="clear: both;"></div> - <?php echo '<a href="'.LINPHA_LINK.'&linCat=newimg">'.i18n('Show All New Images').'</a>'; ?> + <?php echo '<a href="'.LINPHA_LINK.'&linCat=newimg">'.i18n("Show All New Images").'</a>'; ?> <?php } ?> <!-- Browse by Date --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |