more language-improvements

voitto · May 15, 2009 · 9d2afa6 · 9d2afa6
1 parent b8027b4
commit 9d2afa6
Show file tree

Hide file tree

Showing 7 changed files with 96 additions and 32 deletions.
diff --git a/app/omb/plugins/wp.php b/app/omb/plugins/wp.php
@@ -1617,6 +1617,7 @@ function show_prologue_nav() {
 }
 
 function posts_nav_link() {
+require('wp-content/language/lang_chooser.php'); //Loads the language-file
   global $request;
   global $response;
   if (isset($request->params['page']))
@@ -1632,15 +1633,15 @@ function posts_nav_link() {
   if (count($response->collection->members) >= $response->collection->per_page ) {
     $mapper['page'] = ($page + 1);
     echo '<a href="'.$request->url_for( $mapper );
-    echo '">&lt; older</a>';
+    echo '">&lt; ' . $txt['wp_older'] . '</a>';
 
   }
 
   if ($page > 1) {
     $mapper['page'] = ($page - 1);
     echo "&nbsp;&nbsp;&nbsp;";
     echo '<a href="'.$request->url_for( $mapper );
-    echo '">newer &gt;</a>';
+    echo '">' . $txt['wp_newer'] . ' &gt;</a>';
   }
 
 }
@@ -1827,7 +1828,7 @@ function comments_popup_link( $var1, $var2, $var3 ) {
   echo "|&nbsp;<a href=\"JavaScript:add_comment('addcomment-$the_post->id')";
   echo "\">comment</a><div id=\"addcomment-$the_post->id\"></div>";
 
-$userurl = "http://megapump.com";
+$userurl = "http://openmicroblogger.org";
 $etag = 1;
 
 echo '

diff --git a/app/omb/views/identities/_edit.html b/app/omb/views/identities/_edit.html
@@ -1,4 +1,6 @@
-
+<?php
+include 'wp-content/language/lang_chooser.php'; //Loads the language-file
+?>
 
 
 
@@ -16,38 +18,38 @@ <h2><?php if (isset($_SESSION['message'])) { echo $_SESSION['message']; unset($_
 
 
   <tr>
-    <td align="right"><b>Nickname</b></td>
+    <td align="right"><b><?php echo $txt['editprofile_nickname']; ?></b></td>
     <td valign="top" align="left"><input size="30" maxlength="255" id="identity_nickname" name="identity[nickname]" type="text" value="<?php print $Member->nickname; ?>" /></td>
   </tr>
   <tr>
-    <td align="right"><b>Full name</b></td>
+    <td align="right"><b><?php echo $txt['editprofile_full_name']; ?></b></td>
     <td valign="top" align="left"><input size="30" maxlength="255" id="identity_fullname" name="identity[fullname]" type="text" value="<?php print $Member->fullname; ?>" /></td>
   </tr>
   <tr>
-    <td align="right"><b>OpenID URL</b></td>
+    <td align="right"><b><?php echo $txt['editprofile_openid']; ?></b></td>
     <td valign="top" align="left"><input size="50" maxlength="255" id="identity_url" name="identity[url]" type="text" value="<?php print $Member->url; ?>" /></td>
   </tr>
   <tr>
-    <td align="right"><b>Bio</b></td>
+    <td align="right"><b><?php echo $txt['editprofile_bio']; ?></b></td>
     <td valign="top" align="left"><textarea style="width:352px;" rows="3" cols="30" id="identity_bio" name="identity[bio]"><?php print $Member->bio; ?></textarea></td>
   </tr>
   <tr>
-    <td align="right"><b>E-mail</b></td>
+    <td align="right"><b><?php echo $txt['editprofile_email']; ?></b></td>
     <td valign="top" align="left"><input size="50" maxlength="255" id="identity_email_value" name="identity[email_value]" type="text" value="<?php print $Member->email_value; ?>" /></td>
   </tr>
   <tr>
-    <td align="right"><b>Jpeg Photo</b></td>
+    <td align="right"><b><?php echo $txt['editprofile_photo']; ?></b></td>
     <td valign="top" align="left"><input id="identity_photo" name="identity[photo]" type="file" /></td>
   </tr>
   <tr>
-    <td align="right"><b>License URL</b></td>
+    <td align="right"><b><?php echo $txt['editprofile_licence_url']; ?></b></td>
     <td valign="top" align="left"><input size="50" maxlength="255" id="identity_license" name="identity[license]" type="text" value="<?php if (!empty($Member->license)) echo $Member->license; else echo 'http://creativecommons.org/licenses/by/3.0/'; ?>" /></td>
   </tr>
   <tr>
     <td align="right"><b></b></td>
-    <td valign="top" align="left"><br><input onclick="JavaScript:history.back();" name="button_group[Cancel]" value="Cancel" type="button" />
+    <td valign="top" align="left"><br><input onclick="JavaScript:history.back();" name="button_group[Cancel]" value="<?php echo $txt['editprofile_button_cancel']; ?>" type="button" />
 
-<input value="Save" type="submit" name="button_group" /></td>
+<input value="<?php echo $txt['editprofile_button_save']; ?>" type="submit" name="button_group" /></td>
   </tr>
 </form>
 

diff --git a/app/omb/views/pages/_entry.html b/app/omb/views/pages/_entry.html
@@ -1,4 +1,5 @@
 <?php 
+include 'wp-content/language/lang_chooser.php'; //Loads the language-file
 
   global $request;
   $post = strtolower(classify($request->resource));
@@ -34,9 +35,9 @@
     <script src="<?php base_path(); ?>resource/ep_player.js" type="text/javascript"></script>
 
     <div id="flashcontent">
-    	To use the <a href="http://www.e-phonic.com/mp3player/" target="_blank">E-Phonic MP3 Player</a>
-    	you will need <a href="http://www.adobe.com/products/flashplayer/" target="_blank">Adobe Flash Player 9</a> 
-    	or better and a Javascript enabled browser.
+    	<?php echo $txt['pages_entry_ephonic1']; ?><a href="http://www.e-phonic.com/mp3player/" target="_blank">E-Phonic MP3 Player</a>
+    	<?php echo $txt['pages_entry_ephonic2']; ?><a href="http://www.adobe.com/products/flashplayer/" target="_blank">Adobe Flash Player 9</a> 
+    	<?php echo $txt['pages_entry_ephonic3']; ?>.
     </div>
 
     <script type="text/javascript">
@@ -180,22 +181,22 @@
 
 
 
-<tr><td colspan="2"><p>Reply:</p>
+<tr><td colspan="2"><p><?php echo $txt['pages_entry_reply']; ?>:</p>
 
 <form name="replypost" method="post" action="<?php url_for(array('resource'=>$request->resource)); ?>">
 <input type="hidden" name="method" value="post">
 <textarea cols="40" maxlength="140" rows="5" name="<?php echo $post; ?>[title]"><?php if ($author) print "@".$author->nickname." "; ?></textarea>
 <input type="hidden" name="<?php echo $post; ?>[local]" value="1">
 <input type="hidden" name="<?php echo $post; ?>[parent_id]" value="<?php print $Member->id; ?>">
 <input type="hidden" name="<?php echo $post; ?>[profile_id]" value="<?php echo get_profile_id(); ?>">
-<input type="submit" value="Submit Reply">
+<input type="submit" value="<?php echo $txt['pages_entry_submit_reply']; ?>">
 </form>
 
 
 <br />
 </td></tr>
 
-<tr><td colspan="2"><p>Rating:</p>
+<tr><td colspan="2"><p><?php echo $txt['pages_entry_rating']; ?>:</p>
 
 
 
@@ -223,7 +224,7 @@
 <input type="hidden" name="review[target_id]" value="<?php print $Entry->id; ?>">
 <input type="hidden" name="review[profile_id]" value="<?php echo get_profile_id(); ?>">
 <input type="hidden" name="review[reviewer]" value="<?php if ($ident) print $ident->nickname; ?>">
-<input type="submit" value="Submit Rating">
+<input type="submit" value="<?php echo $txt['pages_entry_submit_rating']; ?>">
 </form>
 
 
@@ -244,7 +245,7 @@
 
 <tr><td colspan="2">
 
-<p><b><a href="<?php url_for( 'email_login' ); ?>">Sign In</a> to post a reply</b></p>
+<p><b><a href="<?php url_for( 'email_login' ); ?>"><?php echo $txt['pages_entry_sign_in']; ?></a><?php echo $txt['pages_entry_to_post_a_reply']; ?></b></p>
 
 
 </td></tr>
@@ -269,7 +270,7 @@
   <td>
   <?php $arr = resource_group_members(); ?>
 
-  <p>Members of this forum:</p>
+  <p><?php echo $txt['pages_entry_members_forum']; ?>:</p>
 
   <?php foreach ( $arr as $member_ident ) : ?>
 

diff --git a/app/omb/views/posts/_entry.html b/app/omb/views/posts/_entry.html
@@ -204,14 +204,15 @@
 <input type="hidden" name="<?php echo $post; ?>[local]" value="1">
 <input type="hidden" name="<?php echo $post; ?>[parent_id]" value="<?php print $Member->id; ?>">
 <input type="hidden" name="<?php echo $post; ?>[profile_id]" value="<?php echo get_profile_id(); ?>">
-<input type="submit" value="Submit Reply">
+<input type="submit" value="<?php echo $txt['entry_button_submit_reply']; ?>
+">
 </form>
 
 
 <br />
 </td></tr>
 
-<tr><td colspan="2"><p>Rating:</p>
+<tr><td colspan="2"><p><?php echo $txt['entry_rating']; ?>:</p>
 
 
 
@@ -285,7 +286,7 @@
   <td>
   <?php $arr = resource_group_members(); ?>
 
-  <p>Members of this forum:</p>
+  <p><?php echo $txt['entry_members_forum']; ?>:</p>
 
   <?php foreach ( $arr as $member_ident ) : ?>
 

diff --git a/wp-content/language/eng.php b/wp-content/language/eng.php
@@ -92,7 +92,6 @@
 $txt['index_recent_updates'] = "Recent Updates ";
 $txt['index_rss'] = "RSS";
 $txt['index_permalink'] = "Permalink";
-$txt['index_link'] = "Reply";
 $txt['index_edit'] = "Edit";
 $txt['index_remove'] = "Remove";
 $txt['index_reply'] = "Reply";
@@ -102,6 +101,10 @@
 $txt['index_to_post_a_comment'] = "to post a comment";
 $txt['index_logout'] = "Log out";
 $txt['index_no_updates_yet'] = "No updates yet!";
+$txt['index_newer'] = "Newer";
+$txt['index_older'] = "Older";
+$txt['index_posts'] = "Posts";
+$txt['index_post_comment'] = "Post comment";
 
 
 //////////////////////
@@ -146,6 +149,30 @@
 $txt['sidebar_recent_projects'] = "Recent Projects";
 
 
+//////////////////////
+# /wp-content/themes/p2/sidebar.php
+//////////////////////
+$txt['single_edit'] = "edit";
+$txt['single_more'] = "More...";
+$txt['single_reply'] = "Reply";
+
+
+/////////////////////////////////////
+# /app/omb/views/pages/_entry.html
+/////////////////////////////////////
+$txt['pages_entry_ephonic1'] = "To use the ";
+$txt['pages_entry_ephonic2'] = "you will need ";
+$txt['pages_entry_ephonic3'] = "or better and a Javascript enabled browser";
+$txt['pages_entry_reply'] = "Reply";
+$txt['pages_entry_button_submit_reply'] = "Submit reply";
+$txt['pages_entry_rating'] = "Rating";
+$txt['pages_entry_button_submit_rating'] = "Submit rating";
+$txt['pages_entry_sign_in'] = "Sign In";
+$txt['pages_entry_to_post_a_reply'] = " to post a reply";
+$txt['pages_entry_members_forum'] = "Members of this forum";
+
+
+
 /////////////////////////////////////
 # /app/omb/views/posts/_edit.html
 /////////////////////////////////////
@@ -168,6 +195,7 @@
 $txt['entry_button_submit_rating'] = "Submit rating";
 $txt['entry_sign_in'] = "Sign In";
 $txt['entry_to_post_a_reply'] = " to post a reply";
+$txt['entry_members_forum'] = "Members of this forum";
 
 
 /////////////////////////////////////
@@ -222,7 +250,7 @@
 /////////////////////////////////////
 $txt['editprofile_nickname'] = "Nickname";
 $txt['editprofile_full_name'] = "Full name";
-$txt['editprofile_openid'] = "OpenID";
+$txt['editprofile_openid'] = "OpenID URL";
 $txt['editprofile_bio'] = "Bio";
 $txt['editprofile_email'] = "E-mail";
 $txt['editprofile_photo'] = "Jpeg Photo";
@@ -284,6 +312,8 @@
 $txt['wp_remove'] = "remove";
 $txt['wp_post'] = "Post";
 $txt['wp_photo_nick'] = "Photo and Nickname are required.";
+$txt['wp_older'] = "older";
+$txt['wp_newer'] = "newer";
 
 
 ?>
diff --git a/wp-content/language/ger.php b/wp-content/language/ger.php
@@ -92,7 +92,6 @@
 $txt['index_recent_updates'] = "Neue Eintr&auml;ge ";
 $txt['index_rss'] = "RSS";
 $txt['index_permalink'] = "Permalink";
-$txt['index_link'] = "Antworten";
 $txt['index_edit'] = "Editieren";
 $txt['index_remove'] = "L&ouml;schen";
 $txt['index_reply'] = "Antworten";
@@ -102,6 +101,10 @@
 $txt['index_to_post_a_comment'] = "sein um einen Kommentar zu verfassen";
 $txt['index_logout'] = "Ausloggen";
 $txt['index_no_updates_yet'] = "Bisher gibt es keine Eintr&auml;ge!";
+$txt['index_newer'] = "Neuere";
+$txt['index_older'] = "&Auml;ltere";
+$txt['index_posts'] = "Eintr&auml;ge";
+$txt['index_post_comment'] = "Kommentar absenden";
 
 
 //////////////////////
@@ -146,6 +149,29 @@
 $txt['sidebar_recent_projects'] = "neuste Projekte";
 
 
+//////////////////////
+# /wp-content/themes/p2/sidebar.php
+//////////////////////
+$txt['single_edit'] = "editeren";
+$txt['single_more'] = "Mehr ...";
+$txt['single_reply'] = "Antworten";
+
+
+/////////////////////////////////////
+# /app/omb/views/pages/_entry.html
+/////////////////////////////////////
+$txt['pages_entry_ephonic1'] = "Um das ";
+$txt['pages_entry_ephonic2'] = "zu nutzen ben&ouml;tigst du ";
+$txt['pages_entry_ephonic3'] = "oder neuer und Javascript muss im Browser aktiviert sein.";
+$txt['pages_entry_reply'] = "Antworten";
+$txt['pages_entry_button_submit_reply'] = "Antwort absenden";
+$txt['pages_entry_rating'] = "Bewerten";
+$txt['pages_entry_button_submit_rating'] = "Bewertung absenden";
+$txt['pages_entry_sign_in'] = "Logg dich ein";
+$txt['pages_entry_to_post_a_reply'] = " um eine Antwort zu erstellen";
+$txt['pages_entry_members_forum'] = "Mitglieder dieses Forums";
+
+
 /////////////////////////////////////
 # /app/omb/views/posts/_edit.html
 /////////////////////////////////////
@@ -168,6 +194,7 @@
 $txt['entry_button_submit_rating'] = "Bewertung absenden";
 $txt['entry_sign_in'] = "Logg dich ein";
 $txt['entry_to_post_a_reply'] = " um eine Antwort zu erstellen";
+$txt['entry_members_forum'] = "Mitglieder dieses Forums";
 
 
 /////////////////////////////////////
@@ -222,7 +249,7 @@
 /////////////////////////////////////
 $txt['editprofile_nickname'] = "Nickname";
 $txt['editprofile_full_name'] = "Vollst&auml;ndiger Name";
-$txt['editprofile_openid'] = "OpenID";
+$txt['editprofile_openid'] = "OpenID URL";
 $txt['editprofile_bio'] = "Bio";
 $txt['editprofile_email'] = "E-mail";
 $txt['editprofile_photo'] = "Foto im jpg-Format";
@@ -284,5 +311,7 @@
 $txt['wp_remove'] = "l&ouml;schen";
 $txt['wp_post'] = "Absenden";
 $txt['wp_photo_nick'] = "Foto und Nickname werden ben&ouml;tigt.";
+$txt['wp_older'] = "&Auml;ltere";
+$txt['wp_newer'] = "Neuere";
 
 ?>
diff --git a/wp-content/themes/p2/index.php b/wp-content/themes/p2/index.php
@@ -122,7 +122,7 @@ function test(data) {
 			<span class="actions">
 			<a href="<?php the_permalink( ); ?>" class="thepermalink"><?php echo $txt['index_permalink']; ?></a>
 			<?php if (function_exists('post_reply_link')) 
-				echo post_reply_link(array('before' => ' | ', 'reply_text' => $txt['index_link'], 'add_below' => 'prologue'), get_the_id()); ?>
+				echo post_reply_link(array('before' => ' | ', 'reply_text' => $txt['index_reply'], 'add_below' => 'prologue'), get_the_id()); ?>
 			<?php if (current_user_can('edit_post', get_the_id())) { ?>
 			|  <a href="<?php echo (get_edit_post_link( get_the_id() ))?>" class="post-edit-link" rel="<?php the_ID(); ?>"><?php echo $txt['index_edit']; ?></a>
 			|  <a href="<?php echo (get_edit_post_link( get_the_id(), 'remove' ))?>" class="post-edit-link" rel="<?php the_ID(); ?>"><?php echo $txt['index_remove']; ?></a>
@@ -183,7 +183,7 @@ function test(data) {
 </table>
 <?php } // else user_ID ?>
 
-<div><input id="comment-submit" name="submit" type="submit" value="Post Comment"  /><?php comment_id_fields(); ?>&nbsp;<span class="progress"><img src="<?php bloginfo('template_directory'); ?>/i/indicator.gif" alt="Loading..." /></span></div>
+<div><input id="comment-submit" name="submit" type="submit" value="<?php echo $txt['index_post_comment']; ?>"  /><?php comment_id_fields(); ?>&nbsp;<span class="progress"><img src="<?php bloginfo('template_directory'); ?>/i/indicator.gif" alt="Loading..." /></span></div>
 
 </form>
 </div>
@@ -205,7 +205,7 @@ function test(data) {
 <?php } ?>
 
 
-	<div class="navigation"><p><?php posts_nav_link(' | ','&larr;&nbsp;Newer&nbsp;Posts','Older&nbsp;Posts&nbsp;&rarr;'); ?></p></div>
+	<div class="navigation"><p><?php posts_nav_link(' | ','&larr;&nbsp;' . $txt['index_newer'] . '&nbsp;' . $txt['index_posts'] . '','' . $txt['index_older'] . '&nbsp;' . $txt['index_posts'] . '&nbsp;&rarr;'); ?></p></div>
 </div> <!-- // main -->
 </div> <!-- // sleeve -->