language fixes

voitto · May 10, 2009 · 5d556b0 · 5d556b0
1 parent 42ac66c
commit 5d556b0
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 15 deletions.
diff --git a/app/config/config.yml b/app/config/config.yml
@@ -38,7 +38,7 @@ production:
 
 env:
 
-  site_title: Latest Updates
+  site_title: Recent Updates
   site_subtitle: 
   site_description: 
 

diff --git a/app/omb/views/_index.rss b/app/omb/views/_index.rss
@@ -1,7 +1,7 @@
 <?php echo '<?xml version="1.0" encoding="UTF-8"?>'."\n"; ?>
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://web.resource.org/cc/" xmlns="http://purl.org/rss/1.0/">
   <channel rdf:about="<?php url_for( array( 'resource'=>'posts.rss' )); ?>">
-    <title>Latest Updates</title>
+    <title>Recent Updates</title>
     <link><?php base_url(); ?></link>
     <description>All updates for <?php base_url(); ?></description>
     <cc:licence rdf:resource="http://creativecommons.org/licenses/by/3.0/"></cc:licence>

diff --git a/db/library/dbscript/mysql.php b/db/library/dbscript/mysql.php
@@ -653,11 +653,17 @@ function get_query( $id=NULL, $find_by=NULL, &$model ) {
           else
             $field = $col;
 
+          if ($eq == 'IS')
+            $eqval = $val;
+          else
+            $eqval = "'$val'";
+
           if ($findfirst) {
-            $sql .= " WHERE $field $eq '$val' ";
+            $sql .= " WHERE $field $eq $eqval ";
           } else {
-            $sql .= " $op $field $eq '$val' ";
+            $sql .= " $op $field $eq $eqval ";
           }
+
           $findfirst = false;
 
         }

diff --git a/wp-content/language/lang_chooser.php b/wp-content/language/lang_chooser.php
@@ -15,16 +15,14 @@
 
 } else {
 
-  if (signed_in()) {
-    $Setting =& $db->model('Setting');
-    $lang = $Setting->find_by(array('name'=>'lang','profile_id'=>get_profile_id()));
-    if ($lang)
-      $txt = unserialize($lang->data);
-  }
+  $Translation =& $db->model('Translation');
+  $lang = $Translation->find_by('code',$language_selected);
+  if ($lang)
+    $txt = unserialize($lang->data);
 
 }
 
-if (!(count($txt) > 10))
+if (!(count($txt) > 1))
   include 'wp-content/language/eng.php';
 
 
diff --git a/wp-content/themes/p2/header.php b/wp-content/themes/p2/header.php
@@ -74,9 +74,12 @@
 <li id="nav_help" style="display:inline;padding:5px;">
 <a href="<?php echo ''; ?>" title="Help">Help</a>
 </li>
-<li id="nav_logout" style="display:inline;padding:5px;">
+<li id="nav_login" style="display:inline;padding:5px;">
 <a href="<?php url_for(array('resource'=>'email_login')); ?>" title="Sign in">Sign in</a>
 </li>
+<li id="nav_reg" style="display:inline;padding:5px;">
+<a href="<?php url_for(array('resource'=>'register')); ?>" title="Register">Register</a>
+</li>
 
 <?php endif; ?>
 </ul>

diff --git a/wp-content/themes/p2/tag.php b/wp-content/themes/p2/tag.php
@@ -4,7 +4,7 @@
 ?>
 <div class="sleeve_main">
 <div id="main">
-	<h2>Latest Updates: <?php single_tag_title( ); ?> <a class="rss" href="<?php echo get_tag_feed_link( $tag_obj->term_id ); ?>">RSS</a></h2>
+	<h2>Recent Updates: <?php single_tag_title( ); ?> <a class="rss" href="<?php echo get_tag_feed_link( $tag_obj->term_id ); ?>">RSS</a></h2>
 	<ul id="postlist">
 
 <?php

diff --git a/wp-content/themes/prologue-theme/index.php b/wp-content/themes/prologue-theme/index.php
@@ -48,7 +48,7 @@
 ?>
 
 <div id="main">
-  <h2>Latest Updates <a class="rss" href="<?php bloginfo( 'rss2_url' ); ?>">RSS</a></h2>
+  <h2>Recent Updates <a class="rss" href="<?php bloginfo( 'rss2_url' ); ?>">RSS</a></h2>
   <ul>
 
 <?php

diff --git a/wp-content/themes/prologue-theme/tag.php b/wp-content/themes/prologue-theme/tag.php
@@ -4,7 +4,7 @@
 ?>
 
 <div id="main">
-  <h2>Latest Updates: <?php single_tag_title( ); ?> <a class="rss" href="<?php echo get_tag_feed_link( $tag_obj->term_id ); ?>">RSS</a></h2>
+  <h2>Recent Updates: <?php single_tag_title( ); ?> <a class="rss" href="<?php echo get_tag_feed_link( $tag_obj->term_id ); ?>">RSS</a></h2>
   <ul>
 
 <?php