i18n re-arrange

30 files changed, 12 insertions, 24 deletions

diff --git a/index.php b/index.php
index 91b864df8..cf20d35a2 100644
--- 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;
diff --git a/mod/notifications.php b/mod/notifications.php
index 0bd9c6ffc..2c79781e9 100644
--- 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']
 			));
 		}
diff --git a/view/auto_request.tpl b/view/en/auto_request.tpl
index 97e750083..97e750083 100644
--- a/view/auto_request.tpl
+++ b/view/en/auto_request.tpl
diff --git a/view/cmnt_received_eml.tpl b/view/en/cmnt_received_eml.tpl
index d60fcd375..d60fcd375 100644
--- a/view/cmnt_received_eml.tpl
+++ b/view/en/cmnt_received_eml.tpl
diff --git a/view/contact_edit.tpl b/view/en/contact_edit.tpl
index 96abf0028..96abf0028 100644
--- a/view/contact_edit.tpl
+++ b/view/en/contact_edit.tpl
diff --git a/view/contact_self.tpl b/view/en/contact_self.tpl
index 7f5467b39..7f5467b39 100644
--- a/view/contact_self.tpl
+++ b/view/en/contact_self.tpl
diff --git a/view/dfrn_req_confirm.tpl b/view/en/dfrn_req_confirm.tpl
index f053f22af..f053f22af 100644
--- a/view/dfrn_req_confirm.tpl
+++ b/view/en/dfrn_req_confirm.tpl
diff --git a/view/dfrn_request.tpl b/view/en/dfrn_request.tpl
index 4dd8c0489..4dd8c0489 100644
--- a/view/dfrn_request.tpl
+++ b/view/en/dfrn_request.tpl
diff --git a/view/follow_notify_eml.tpl b/view/en/follow_notify_eml.tpl
index ae758c9a8..ae758c9a8 100644
--- a/view/follow_notify_eml.tpl
+++ b/view/en/follow_notify_eml.tpl
diff --git a/view/friend_complete_eml.tpl b/view/en/friend_complete_eml.tpl
index ab12fcb6b..ab12fcb6b 100644
--- a/view/friend_complete_eml.tpl
+++ b/view/en/friend_complete_eml.tpl
diff --git a/view/insecure_net.tpl b/view/en/insecure_net.tpl
index 5628639cc..5628639cc 100644
--- a/view/insecure_net.tpl
+++ b/view/en/insecure_net.tpl
diff --git a/view/install_db.tpl b/view/en/install_db.tpl
index d5f28828e..d5f28828e 100644
--- a/view/install_db.tpl
+++ b/view/en/install_db.tpl
diff --git a/view/intro_complete_eml.tpl b/view/en/intro_complete_eml.tpl
index a60745ec5..a60745ec5 100644
--- a/view/intro_complete_eml.tpl
+++ b/view/en/intro_complete_eml.tpl
diff --git a/view/lostpass.tpl b/view/en/lostpass.tpl
index a7040c149..a7040c149 100644
--- a/view/lostpass.tpl
+++ b/view/en/lostpass.tpl
diff --git a/view/lostpass_eml.tpl b/view/en/lostpass_eml.tpl
index c350236a4..c350236a4 100644
--- a/view/lostpass_eml.tpl
+++ b/view/en/lostpass_eml.tpl
diff --git a/view/mail_received_eml.tpl b/view/en/mail_received_eml.tpl
index 261aec4be..261aec4be 100644
--- a/view/mail_received_eml.tpl
+++ b/view/en/mail_received_eml.tpl
diff --git a/view/passchanged_eml.tpl b/view/en/passchanged_eml.tpl
index 9692159e1..9692159e1 100644
--- a/view/passchanged_eml.tpl
+++ b/view/en/passchanged_eml.tpl
diff --git a/view/profile_advanced.php b/view/en/profile_advanced.php
index 1f917f663..1f917f663 100644
--- a/view/profile_advanced.php
+++ b/view/en/profile_advanced.php
diff --git a/view/pwdreset.tpl b/view/en/pwdreset.tpl
index dd609f061..dd609f061 100644
--- a/view/pwdreset.tpl
+++ b/view/en/pwdreset.tpl
diff --git a/view/register-link.tpl b/view/en/register-link.tpl
index 7f3fca4d6..7f3fca4d6 100644
--- a/view/register-link.tpl
+++ b/view/en/register-link.tpl
diff --git a/view/register_open_eml.tpl b/view/en/register_open_eml.tpl
index 600b49d13..600b49d13 100644
--- a/view/register_open_eml.tpl
+++ b/view/en/register_open_eml.tpl
diff --git a/view/register_verify_eml.tpl b/view/en/register_verify_eml.tpl
index 60c38d800..60c38d800 100644
--- a/view/register_verify_eml.tpl
+++ b/view/en/register_verify_eml.tpl
diff --git a/view/request_notify_eml.tpl b/view/en/request_notify_eml.tpl
index 9eef7a61e..9eef7a61e 100644
--- a/view/request_notify_eml.tpl
+++ b/view/en/request_notify_eml.tpl
diff --git a/view/settings.tpl b/view/en/settings.tpl
index bf54a54c6..bf54a54c6 100644
--- a/view/settings.tpl
+++ b/view/en/settings.tpl
diff --git a/view/settings_nick_set.tpl b/view/en/settings_nick_set.tpl
index a36b3b9a2..a36b3b9a2 100644
--- a/view/settings_nick_set.tpl
+++ b/view/en/settings_nick_set.tpl
diff --git a/view/settings_nick_subdir.tpl b/view/en/settings_nick_subdir.tpl
index 303c24df7..303c24df7 100644
--- a/view/settings_nick_subdir.tpl
+++ b/view/en/settings_nick_subdir.tpl
diff --git a/view/settings_nick_unset.tpl b/view/en/settings_nick_unset.tpl
index 903768b59..903768b59 100644
--- a/view/settings_nick_unset.tpl
+++ b/view/en/settings_nick_unset.tpl
diff --git a/view/wall_received_eml.tpl b/view/en/wall_received_eml.tpl
index c296de785..c296de785 100644
--- a/view/wall_received_eml.tpl
+++ b/view/en/wall_received_eml.tpl
diff --git a/view/intros.tpl b/view/intros.tpl
index 30198beb8..f903515ca 100644
--- 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>
diff --git a/view/sidenote.tpl b/view/sidenote.tpl
deleted file mode 100644
index 44d34bf2a..000000000
--- a/view/sidenote.tpl
+++ /dev/null
@@ -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>