Commit 4240a23a authored by Friendika's avatar Friendika

i18n re-arrange

parent 21c18ced
......@@ -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;
......@@ -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']
));
}
......
<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>
<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>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment