Changeset 3295

Timestamp:

12/12/2005 10:48:30 PM (19 years ago)

Author:

ryan

Message:

i18n updates from nbachiyski. fixes #2069

Location:

trunk/wp-admin

Files:

• admin-functions.php (modified) (1 diff)
• admin-header.php (modified) (4 diffs)
• execute-pings.php (modified) (1 diff)
• index.php (modified) (1 diff)
• inline-uploading.php (modified) (1 diff)
• link-categories.php (modified) (1 diff)
• link-import.php (modified) (1 diff)
• link-manager.php (modified) (1 diff)
• link-parse-opml.php (modified) (1 diff)
• moderation.php (modified) (4 diffs)
• plugin-editor.php (modified) (2 diffs)
• plugins.php (modified) (2 diffs)
• templates.php (modified) (2 diffs)
• theme-editor.php (modified) (2 diffs)
• update-links.php (modified) (1 diff)
• users.php (modified) (1 diff)

trunk/wp-admin/admin-functions.php

@@ -1755 +1755 @@
     $new_file = $uploads['path'] . "/$filename";
     if ( false === move_uploaded_file($file['tmp_name'], $new_file) )
-        die('The uploaded file could not be moved to $file.');
+        die(__('The uploaded file could not be moved to $file.'));
 
     // Set correct file permissions

trunk/wp-admin/admin-header.php

@@ -134 +134 @@
     newcatSub.name = 'Button';
     newcatSub.id = 'catadd';
-    newcatSub.value = '<?php _e('Add'); ?>';
+    newcatSub.value = '<?php echo addslashes(__('Add')); ?>';
     newcatSub.onclick = ajaxNewCat;
 
@@ -142 +142 @@
 
     howto = document.createElement('span');
-    howto.innerHTML = '<?php _e('Separate multiple categories with commas.'); ?>';
+    howto.innerHTML = '<?php echo addslashes(__('Separate multiple categories with commas.')); ?>';
     howto.id = 'howto';
     ajaxcat.appendChild(howto);
@@ -161 +161 @@
 function newCatLoading() {
     var p = getResponseElement();
-    p.innerHTML = 'Sending Data...';
+    p.innerHTML = '<?php echo addslashes(__('Sending Data...')); ?>';
 }
 
 function newCatLoaded() {
     var p = getResponseElement();
-    p.innerHTML = 'Data Sent...';
+    p.innerHTML = '<?php echo addslashes(__('Data Sent...')); ?>';
 }
 
 function newCatInteractive() {
     var p = getResponseElement();
-    p.innerHTML = 'Processing Request...';
+    p.innerHTML = '<?php echo addslashes(__('Processing Request...')); ?>';
 }
 
@@ -187 +187 @@
 //      alert(id);
         if ( id == '-1' ) {
-            p.innerHTML = "You don't have permission to do that.";
+            p.innerHTML = "<?php echo addslashes(__("You don't have permission to do that.")); ?>";
             return;
         }
         if ( id == '0' ) {
-            p.innerHTML = "That category name is invalid.  Try something else.";
+            p.innerHTML = "<?php echo addslashes(__('That category name is invalid.  Try something else.')); ?>";
             return;
         }

trunk/wp-admin/execute-pings.php

@@ -3 +3 @@
 
 if ( ! current_user_can('edit_posts') )
-    die ("Cheatin' uh?");
+    die (__("Cheatin' uh?"));
 
 echo '/* No Styles Here */';

trunk/wp-admin/index.php

@@ -130 +130 @@
 if ( isset($rss->items) && 0 != count($rss->items) ) {
 ?>
-<h3>WordPress Development Blog</h3>
+<h3><?php _e('WordPress Development Blog'); ?></h3>
 <?php
 $rss->items = array_slice($rss->items, 0, 3);

trunk/wp-admin/inline-uploading.php

@@ -245 +245 @@
 ";
             $popups .= "<div id='popup{$ID}' class='popup'>
-    <div class='filetype'>File Type: ".str_replace('/',"/\n",$attachment['post_mime_type'])."</div>
+    <div class='filetype'>".__('File Type:').' '.str_replace('/',"/\n",$attachment['post_mime_type'])."</div>
     <a id=\"L{$ID}\" onclick=\"toggleOtherLink({$ID});return false;\" href=\"javascript:void()\">$__linked_to_file</a>
     {$send_delete_cancel}

trunk/wp-admin/link-categories.php

@@ -445 +445 @@
 <div class="wrap">
     <h3><?php _e('Note:') ?></h3>
-    <?php printf(__('<p>Deleting a link category does not delete links from that category.<br />It will just set them back to the default category <b>%s</b>.'), get_linkcatname(1)) ?></p>
+    <p><?php printf(__('Deleting a link category does not delete links from that category.<br />It will just set them back to the default category <strong>%s</strong>.'), get_linkcatname(1)) ?></p>
 </div>
 <?php

trunk/wp-admin/link-import.php

@@ -109 +109 @@
                                 VALUES('{$urls[$i]}', '".$wpdb->escape($names[$i])."', '', $cat_id, '".$wpdb->escape($descriptions[$i])."', $user_ID, '{$feeds[$i]}')\n";
                         $result = $wpdb->query($query);
-                        echo sprintf(__("<p>Inserted <strong>%s</strong></p>"), $names[$i]);
+                        echo sprintf('<p>'.__('Inserted <strong>%s</strong>').'</p>', $names[$i]);
                     }
 ?>

trunk/wp-admin/link-manager.php

@@ -292 +292 @@
         echo ">".$row->cat_id.": ".wp_specialchars($row->cat_name);
         if ($row->auto_toggle == 'Y')
-            echo ' (auto toggle)';
+            echo ' '.__('(auto toggle)');
         echo "</option>\n";
     }

trunk/wp-admin/link-parse-opml.php

@@ -56 +56 @@
 
 if (!xml_parse($xml_parser, $opml, true)) {
-    echo(sprintf("XML error: %s at line %d",
+    echo(sprintf(__('XML error: %1$s at line %2$s'),
                    xml_error_string(xml_get_error_code($xml_parser)),
                    xml_get_current_line_number($xml_parser)));

trunk/wp-admin/moderation.php

@@ -33 +33 @@
 
     if ( ! current_user_can('moderate_comments') )
-        die(__('<p>Your level is not high enough to moderate comments.</p>'));
+    die('<p>'.__('Your level is not high enough to moderate comments.').'</p>');
 
     $item_ignored = 0;
@@ -85 +85 @@
     if ($approved) {
         if ('1' == $approved) {
-         echo __("1 comment approved <br />") . "\n";
+            echo __("1 comment approved") . " <br/>\n";
         } else {
          echo sprintf(__("%s comments approved <br />"), $approved) . "\n";
@@ -92 +92 @@
     if ($deleted) {
         if ('1' == $deleted) {
-        echo __("1 comment deleted <br />") . "\n";
-        } else {
-        echo sprintf(__("%s comments deleted <br />"), $deleted) . "\n";
+            echo __("1 comment deleted") . " <br/>\n";
+        } else {
+            echo sprintf(__("%s comments deleted"), $deleted) . " <br/>\n";
         }
     }
     if ($spam) {
         if ('1' == $spam) {
-        echo __("1 comment marked as spam <br />") . "\n";
+            echo __("1 comment marked as spam") . " <br/>\n";
         } else {
-        echo sprintf(__("%s comments marked as spam <br />"), $spam) . "\n";
+            echo sprintf(__("%s comments marked as spam"), $spam) . " <br/>\n";
         }
     }
     if ($ignored) {
         if ('1' == $ignored) {
-        echo __("1 comment unchanged <br />") . "\n";
-        } else {
-        echo sprintf(__("%s comments unchanged <br />"), $ignored) . "\n";
+            echo __("1 comment unchanged") . " <br/>\n";
+        } else {
+            echo sprintf(__("%s comments unchanged"), $ignored) . " <br/>\n";
         }
     }
@@ -207 +207 @@
 } else {
     // nothing to approve
-    echo __("<p>Currently there are no comments for you to moderate.</p>") . "\n";
+    echo '<p>'.__("Currently there are no comments for you to moderate.") . "</p>\n";
 }
 ?>

trunk/wp-admin/plugin-editor.php

@@ -36 +36 @@
 
     if ( !current_user_can('edit_plugins') )
-        die(__('<p>You have do not have sufficient permissions to edit templates for this blog.</p>'));
+    die('<p>'.__('You have do not have sufficient permissions to edit templates for this blog.').'</p>');
 
     $newcontent = stripslashes($_POST['newcontent']);
@@ -56 +56 @@
     require_once('admin-header.php');
     if ( !current_user_can('edit_plugins') )
-        die(__('<p>You have do not have sufficient permissions to edit plugins for this blog.</p>'));
+    die('<p>'.__('You have do not have sufficient permissions to edit plugins for this blog.').'</p>');
 
     update_recently_edited("wp-content/plugins/$file");

trunk/wp-admin/plugins.php

@@ -73 +73 @@
 
 if (empty($plugins)) {
-    _e("<p>Couldn't open plugins directory or there are no plugins available.</p>"); // TODO: make more helpful
+    echo '<p>';
+    _e("Couldn't open plugins directory or there are no plugins available."); // TODO: make more helpful
+    echo '</p>';
 } else {
 ?>
@@ -101 +103 @@
         <td class='name'>{$plugin_data['Title']}</td>
         <td class='vers'>{$plugin_data['Version']}</td>
-        <td class='desc'>{$plugin_data['Description']} <cite>By {$plugin_data['Author']}.</cite></td>
+        <td class='desc'>{$plugin_data['Description']} <cite>".sprintf(__('By %s'), $plugin_data['Author']).".</cite></td>
         <td class='togl'>$action</td>
     </tr>";

trunk/wp-admin/templates.php

@@ -38 +38 @@
 
     if ( ! current_user_can('edit_files') )
-        die(__('<p>You have do not have sufficient permissions to edit templates for this blog.</p>'));
+    die('<p>'.__('You have do not have sufficient permissions to edit templates for this blog.').'</p>');
 
     $newcontent = stripslashes($_POST['newcontent']);
@@ -59 +59 @@
     
     if ( ! current_user_can('edit_files') )
-        die(__('<p>You have do not have sufficient permissions to edit templates for this blog.</p>'));
+    die('<p>'.__('You have do not have sufficient permissions to edit templates for this blog.').'</p>');
 
     if ( strstr( $file, 'wp-config.php' ) )
-        die( __('<p>The config file cannot be edited or viewed through the web interface. Sorry!</p>') );
+    die('<p>'.__('The config file cannot be edited or viewed through the web interface. Sorry!').'</p>');
 
     update_recently_edited($file);

trunk/wp-admin/theme-editor.php

@@ -49 +49 @@
 
     if ( !current_user_can('edit_themes') )
-        die(__('<p>You have do not have sufficient permissions to edit templates for this blog.</p>'));
+    die('<p>'.__('You have do not have sufficient permissions to edit templates for this blog.').'</p>');
 
     $newcontent = stripslashes($_POST['newcontent']);
@@ -70 +70 @@
     require_once('admin-header.php');
     if ( !current_user_can('edit_themes') )
-        die(__('<p>You have do not have sufficient permissions to edit themes for this blog.</p>'));
+    die('<p>'.__('You have do not have sufficient permissions to edit themes for this blog.').'</p>');
 
     update_recently_edited($file);

trunk/wp-admin/update-links.php

@@ -4 +4 @@
 
 if ( !get_option('use_linksupdate') )
-    die('Feature disabled.');
+    die(__('Feature disabled.'));
 
 $link_uris = $wpdb->get_col("SELECT link_url FROM $wpdb->links");

trunk/wp-admin/users.php

@@ -96 +96 @@
         $user = new WP_User($id);
         if ($id == $current_user->id) {
-            echo "<li>" . sprintf('ID #%1s: %2s <strong>The current user will not be deleted.</strong>', $id, $user->user_login) . "</li>\n";
+            echo "<li>" . sprintf(__('ID #%1s: %2s <strong>The current user will not be deleted.</strong>'), $id, $user->user_login) . "</li>\n";
         } else {
-            echo "<li><input type=\"hidden\" name=\"users[]\" value=\"{$id}\" />" . sprintf('ID #%1s: %2s', $id, $user->user_login) . "</li>\n";
+            echo "<li><input type=\"hidden\" name=\"users[]\" value=\"{$id}\" />" . sprintf(__('ID #%1s: %2s'), $id, $user->user_login) . "</li>\n";
             $go_delete = true;
         }