keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of git://github.com/friendica/friendica

Browse source
This commit is contained in:
Tobias Diekershoff 2013-01-02 11:10:59 +01:00
commit 68d304cc0f
9 changed files with 26 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
require_once('include/features.php'); require_once('include/features.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '3.1.1574' ); define ( 'FRIENDICA_VERSION', '3.1.1575' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1157 ); define ( 'DB_UPDATE_VERSION', 1157 );

3
mod/register.php
View file

@ -239,7 +239,6 @@ function register_content(&$a) {
)); ));
} }
$license = ''; $license = '';
$o = get_markup_template("register.tpl"); $o = get_markup_template("register.tpl");
@ -267,7 +266,7 @@ function register_content(&$a) {
'$openid' => $openid_url, '$openid' => $openid_url,
'$namelabel' => t('Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\x29" . ': '), '$namelabel' => t('Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\x29" . ': '),
'$addrlabel' => t('Your Email Address: '), '$addrlabel' => t('Your Email Address: '),
'$nickdesc' => t('Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'<strong>nickname@$sitename</strong>\'.'), '$nickdesc' => str_replace('$sitename',$a->get_hostname(),t('Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'<strong>nickname@$sitename</strong>\'.')),
'$nicklabel' => t('Choose a nickname: '), '$nicklabel' => t('Choose a nickname: '),
'$photo' => $photo, '$photo' => $photo,
'$publish' => $profile_publish, '$publish' => $profile_publish,

4
util/messages.po
View file

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 3.1.1574\n" "Project-Id-Version: 3.1.1575\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-12-31 10:00-0800\n" "POT-Creation-Date: 2013-01-01 10:00-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"

4
view/register.tpl
View file

@ -11,10 +11,12 @@
<p id="register-fill-desc">$fillwith</p> <p id="register-fill-desc">$fillwith</p>
<p id="register-fill-ext">$fillext</p> <p id="register-fill-ext">$fillext</p>
{{ if $oidlabel }}
<div id="register-openid-wrapper" > <div id="register-openid-wrapper" >
$oidhtml <label for="register-openid" id="label-register-openid" >$oidlabel</label><input type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="$openid" >
</div> </div>
<div id="register-openid-end" ></div> <div id="register-openid-end" ></div>
{{ endif }}
{{ if $invitations }} {{ if $invitations }}

4
view/smarty3/register.tpl
View file

@ -11,10 +11,12 @@
<p id="register-fill-desc">{{$fillwith}}</p> <p id="register-fill-desc">{{$fillwith}}</p>
<p id="register-fill-ext">{{$fillext}}</p> <p id="register-fill-ext">{{$fillext}}</p>
{{if $oidlabel }}
<div id="register-openid-wrapper" > <div id="register-openid-wrapper" >
{{$oidhtml}} <label for="register-openid" id="label-register-openid" >{{$oidlabel}}</label><input type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="{{$openid}}" >
</div> </div>
<div id="register-openid-end" ></div> <div id="register-openid-end" ></div>
{{/if}}
{{if $invitations}} {{if $invitations}}

6
view/theme/frost-mobile/register.tpl
View file

@ -11,10 +11,12 @@
<p id="register-realpeople">$realpeople</p> <p id="register-realpeople">$realpeople</p>
<br /> <br />
<div id="register-openid-wrapper" class="field input" > {{ if $oidlabel }}
$oidhtml <div id="register-openid-wrapper" >
<label for="register-openid" id="label-register-openid" >$oidlabel</label><input type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="$openid" >
</div> </div>
<div id="register-openid-end" ></div> <div id="register-openid-end" ></div>
{{ endif }}
<div class="register-explain-wrapper"> <div class="register-explain-wrapper">
<p id="register-fill-desc">$fillwith $fillext</p> <p id="register-fill-desc">$fillwith $fillext</p>

6
view/theme/frost-mobile/smarty3/register.tpl
View file

@ -11,10 +11,12 @@
<p id="register-realpeople">{{$realpeople}}</p> <p id="register-realpeople">{{$realpeople}}</p>
<br /> <br />
<div id="register-openid-wrapper" class="field input" > {{if $oidlabel }}
{{$oidhtml}} <div id="register-openid-wrapper" >
<label for="register-openid" id="label-register-openid" >{{$oidlabel}}</label><input type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="{{$openid}}" >
</div> </div>
<div id="register-openid-end" ></div> <div id="register-openid-end" ></div>
{{/if}}
<div class="register-explain-wrapper"> <div class="register-explain-wrapper">
<p id="register-fill-desc">{{$fillwith}} {{$fillext}}</p> <p id="register-fill-desc">{{$fillwith}} {{$fillext}}</p>

6
view/theme/frost/register.tpl
View file

@ -11,10 +11,12 @@
<p id="register-realpeople">$realpeople</p> <p id="register-realpeople">$realpeople</p>
<br /> <br />
<div id="register-openid-wrapper" class="field input" > {{ if $oidlabel }}
$oidhtml <div id="register-openid-wrapper" >
<label for="register-openid" id="label-register-openid" >$oidlabel</label><input type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="$openid" >
</div> </div>
<div id="register-openid-end" ></div> <div id="register-openid-end" ></div>
{{ endif }}
<div class="register-explain-wrapper"> <div class="register-explain-wrapper">
<p id="register-fill-desc">$fillwith $fillext</p> <p id="register-fill-desc">$fillwith $fillext</p>

6
view/theme/frost/smarty3/register.tpl
View file

@ -11,10 +11,12 @@
<p id="register-realpeople">{{$realpeople}}</p> <p id="register-realpeople">{{$realpeople}}</p>
<br /> <br />
<div id="register-openid-wrapper" class="field input" > {{if $oidlabel }}
{{$oidhtml}} <div id="register-openid-wrapper" >
<label for="register-openid" id="label-register-openid" >{{$oidlabel}}</label><input type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="{{$openid}}" >
</div> </div>
<div id="register-openid-end" ></div> <div id="register-openid-end" ></div>
{{/if}}
<div class="register-explain-wrapper"> <div class="register-explain-wrapper">
<p id="register-fill-desc">{{$fillwith}} {{$fillext}}</p> <p id="register-fill-desc">{{$fillwith}} {{$fillext}}</p>