i18n re-arrange

This commit is contained in:
Friendika 2010-11-15 23:27:12 -08:00
parent 21c18cedc7
commit 4240a23a8a
30 changed files with 12 additions and 24 deletions

View file

@ -123,14 +123,18 @@ $a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array(
$page = $a->page; $page = $a->page;
$profile = $a->profile; $profile = $a->profile;
$lang = get_config('system','language'); $lang = get_config('system','language');
if($lang === false)
$lang = 'en';
header("Content-type: text/html; charset=utf-8"); header("Content-type: text/html; charset=utf-8");
$template = "view/" . (($lang) ? $lang . "/" : "") $template = 'view/' . $lang . '/'
. ((x($a->page,'template')) ? $a->page['template'] : 'default' ) . ((x($a->page,'template')) ? $a->page['template'] : 'default' ) . '.php';
. ".php";
if(file_exists($template))
require_once($template); require_once($template);
else
require_once(str_replace($lang . '/', '', $template));
session_write_close(); session_write_close();
exit; exit;

View file

@ -104,6 +104,7 @@ function notifications_content(&$a) {
$o .= replace_macros($tpl,array( $o .= replace_macros($tpl,array(
'$str_notifytype' => t('Notification type: '),
'$notify_type' => (($rr['network'] === 'dfrn') ? t('Friend/Connect Request') : t('New Follower')), '$notify_type' => (($rr['network'] === 'dfrn') ? t('Friend/Connect Request') : t('New Follower')),
'$dfrn_text' => $dfrn_text, '$dfrn_text' => $dfrn_text,
'$dfrn_id' => $rr['issued-id'], '$dfrn_id' => $rr['issued-id'],
@ -114,6 +115,7 @@ function notifications_content(&$a) {
'$fullname' => $rr['name'], '$fullname' => $rr['name'],
'$url' => $rr['url'], '$url' => $rr['url'],
'$knowyou' => $knowyou, '$knowyou' => $knowyou,
'$approve' => t('Approve'),
'$note' => $rr['note'] '$note' => $rr['note']
)); ));
} }

View file

@ -1,7 +1,7 @@
<div class="intro-wrapper" id="intro-$contact_id" > <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> <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> <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> <div class="intro-knowyou">$knowyou</div>
@ -20,7 +20,7 @@
$dfrn_text $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> </form>
</div> </div>
<div class="intro-end"></div> <div class="intro-end"></div>

View file

@ -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>