i18n re-arrange

2010-11-15 23:27:12 -08:00 · 2010-11-15 23:27:12 -08:00 · 4240a23a8a
parent 21c18cedc7
commit 4240a23a8a
30 changed files with 12 additions and 24 deletions
--- a/index.php
+++ b/index.php
@ -123,14 +123,18 @@ $a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array(
 $page    = $a->page;
 $profile = $a->profile;
 $lang    = get_config('system','language');
+if($lang === false)
+	$lang = 'en';

 header("Content-type: text/html; charset=utf-8");

-$template = "view/" . (($lang) ? $lang . "/" : "") 
-	. ((x($a->page,'template')) ? $a->page['template'] : 'default' ) 
-	. ".php";
+$template = 'view/' . $lang . '/' 
+	. ((x($a->page,'template')) ? $a->page['template'] : 'default' ) . '.php';

-require_once($template);
+if(file_exists($template))
+	require_once($template);
+else
+	require_once(str_replace($lang . '/', '', $template));

 session_write_close();
 exit;
--- a/mod/notifications.php
+++ b/mod/notifications.php
@ -104,6 +104,7 @@ function notifications_content(&$a) {


 			$o .= replace_macros($tpl,array(
+				'$str_notifytype' => t('Notification type: '),
 				'$notify_type' => (($rr['network'] === 'dfrn') ? t('Friend/Connect Request') : t('New Follower')),
 				'$dfrn_text' => $dfrn_text,	
 				'$dfrn_id' => $rr['issued-id'],
@ -114,6 +115,7 @@ function notifications_content(&$a) {
 				'$fullname' => $rr['name'],
 				'$url' => $rr['url'],
 				'$knowyou' => $knowyou,
+				'$approve' => t('Approve'),
 				'$note' => $rr['note']
 			));
 		}
--- a/view/en/auto_request.tpl
+++ b/view/en/auto_request.tpl
--- a/view/en/cmnt_received_eml.tpl
+++ b/view/en/cmnt_received_eml.tpl
--- a/view/en/contact_edit.tpl
+++ b/view/en/contact_edit.tpl
--- a/view/en/contact_self.tpl
+++ b/view/en/contact_self.tpl
--- a/view/en/dfrn_req_confirm.tpl
+++ b/view/en/dfrn_req_confirm.tpl
--- a/view/en/dfrn_request.tpl
+++ b/view/en/dfrn_request.tpl
--- a/view/en/follow_notify_eml.tpl
+++ b/view/en/follow_notify_eml.tpl
--- a/view/en/friend_complete_eml.tpl
+++ b/view/en/friend_complete_eml.tpl
--- a/view/en/insecure_net.tpl
+++ b/view/en/insecure_net.tpl
--- a/view/en/install_db.tpl
+++ b/view/en/install_db.tpl
--- a/view/en/intro_complete_eml.tpl
+++ b/view/en/intro_complete_eml.tpl
--- a/view/en/lostpass.tpl
+++ b/view/en/lostpass.tpl
--- a/view/en/lostpass_eml.tpl
+++ b/view/en/lostpass_eml.tpl
--- a/view/en/mail_received_eml.tpl
+++ b/view/en/mail_received_eml.tpl
--- a/view/en/passchanged_eml.tpl
+++ b/view/en/passchanged_eml.tpl
--- a/view/en/profile_advanced.php
+++ b/view/en/profile_advanced.php
--- a/view/en/pwdreset.tpl
+++ b/view/en/pwdreset.tpl
--- a/view/en/register-link.tpl
+++ b/view/en/register-link.tpl
--- a/view/en/register_open_eml.tpl
+++ b/view/en/register_open_eml.tpl
--- a/view/en/register_verify_eml.tpl
+++ b/view/en/register_verify_eml.tpl
--- a/view/en/request_notify_eml.tpl
+++ b/view/en/request_notify_eml.tpl
--- a/view/en/settings.tpl
+++ b/view/en/settings.tpl
--- a/view/en/settings_nick_set.tpl
+++ b/view/en/settings_nick_set.tpl
--- a/view/en/settings_nick_subdir.tpl
+++ b/view/en/settings_nick_subdir.tpl
--- a/view/en/settings_nick_unset.tpl
+++ b/view/en/settings_nick_unset.tpl
--- a/view/en/wall_received_eml.tpl
+++ b/view/en/wall_received_eml.tpl
--- a/view/intros.tpl
+++ b/view/intros.tpl
@ -1,7 +1,7 @@

 <div class="intro-wrapper" id="intro-$contact_id" >

-<p class="intro-desc">Notification type: $notify_type</p>
+<p class="intro-desc">$str_notifytype $notify_type</p>
 <div class="intro-fullname" id="intro-fullname-$contact_id" >$fullname</div>
 <a class="intro-url-link" id="intro-url-link-$contact_id" href="$url" ><img id="photo-$contact_id" class="intro-photo" src="$photo" width="175" height=175" name="$fullname" alt="fullname" /></a>
 <div class="intro-knowyou">$knowyou</div>
@ -20,7 +20,7 @@

 $dfrn_text

-<input class="intro-submit-approve" type="submit" name="submit" value="Approve" />
+<input class="intro-submit-approve" type="submit" name="submit" value="$approve" />
 </form>
 </div>
 <div class="intro-end"></div>
--- a/view/sidenote.tpl
+++ b/view/sidenote.tpl
@ -1,18 +0,0 @@
-
-<div id="sidenote-wrapper" >
-<p id="sidenote-desc" >
-Write something
-</p>
-<form id="sidenote-form" action="profiles/$profile_id" method="post" >
-<input type="hidden" name="type" value="sidenote" />
-
-<textarea rows="40" cols="24" id="sidenote-text" name="sidenote" >$sidenote</textarea>
-
-</div>
-<div id="sidenote-submit-wrapper" >
-<input type="submit" id="sidenote-submit" name="submit" value="Submit" />
-
-</div>
-<div id="sidenote-end"></div>
-</form>
-</div>