Merge branch 'master' of git://github.com/friendica/friendica
This commit is contained in:
Tobias Diekershoff
commit
68d304cc0f
2
boot.php
2
boot.php
|
|
@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
|
|||
require_once('include/features.php');
|
||||
|
||||
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
||||
define ( 'FRIENDICA_VERSION', '3.1.1574' );
|
||||
define ( 'FRIENDICA_VERSION', '3.1.1575' );
|
||||
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
|
||||
define ( 'DB_UPDATE_VERSION', 1157 );
|
||||
|
||||
|
|
|
|||
|
|
@ -239,7 +239,6 @@ function register_content(&$a) {
|
|||
));
|
||||
}
|
||||
|
||||
|
||||
$license = '';
|
||||
|
||||
$o = get_markup_template("register.tpl");
|
||||
|
|
@ -267,7 +266,7 @@ function register_content(&$a) {
|
|||
'$openid' => $openid_url,
|
||||
'$namelabel' => t('Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\x29" . ': '),
|
||||
'$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: '),
|
||||
'$photo' => $photo,
|
||||
'$publish' => $profile_publish,
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@
|
|||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: 3.1.1574\n"
|
||||
"Project-Id-Version: 3.1.1575\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"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
|
|
|||
|
|
@ -11,10 +11,12 @@
|
|||
<p id="register-fill-desc">$fillwith</p>
|
||||
<p id="register-fill-ext">$fillext</p>
|
||||
|
||||
{{ if $oidlabel }}
|
||||
<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 id="register-openid-end" ></div>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $invitations }}
|
||||
|
||||
|
|
|
|||
|
|
@ -11,10 +11,12 @@
|
|||
<p id="register-fill-desc">{{$fillwith}}</p>
|
||||
<p id="register-fill-ext">{{$fillext}}</p>
|
||||
|
||||
{{if $oidlabel }}
|
||||
<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 id="register-openid-end" ></div>
|
||||
{{/if}}
|
||||
|
||||
{{if $invitations}}
|
||||
|
||||
|
|
|
|||
|
|
@ -11,10 +11,12 @@
|
|||
<p id="register-realpeople">$realpeople</p>
|
||||
|
||||
<br />
|
||||
<div id="register-openid-wrapper" class="field input" >
|
||||
$oidhtml
|
||||
{{ if $oidlabel }}
|
||||
<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 id="register-openid-end" ></div>
|
||||
{{ endif }}
|
||||
|
||||
<div class="register-explain-wrapper">
|
||||
<p id="register-fill-desc">$fillwith $fillext</p>
|
||||
|
|
|
|||
|
|
@ -11,10 +11,12 @@
|
|||
<p id="register-realpeople">{{$realpeople}}</p>
|
||||
|
||||
<br />
|
||||
<div id="register-openid-wrapper" class="field input" >
|
||||
{{$oidhtml}}
|
||||
{{if $oidlabel }}
|
||||
<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 id="register-openid-end" ></div>
|
||||
{{/if}}
|
||||
|
||||
<div class="register-explain-wrapper">
|
||||
<p id="register-fill-desc">{{$fillwith}} {{$fillext}}</p>
|
||||
|
|
|
|||
|
|
@ -11,10 +11,12 @@
|
|||
<p id="register-realpeople">$realpeople</p>
|
||||
|
||||
<br />
|
||||
<div id="register-openid-wrapper" class="field input" >
|
||||
$oidhtml
|
||||
{{ if $oidlabel }}
|
||||
<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 id="register-openid-end" ></div>
|
||||
{{ endif }}
|
||||
|
||||
<div class="register-explain-wrapper">
|
||||
<p id="register-fill-desc">$fillwith $fillext</p>
|
||||
|
|
|
|||
|
|
@ -11,10 +11,12 @@
|
|||
<p id="register-realpeople">{{$realpeople}}</p>
|
||||
|
||||
<br />
|
||||
<div id="register-openid-wrapper" class="field input" >
|
||||
{{$oidhtml}}
|
||||
{{if $oidlabel }}
|
||||
<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 id="register-openid-end" ></div>
|
||||
{{/if}}
|
||||
|
||||
<div class="register-explain-wrapper">
|
||||
<p id="register-fill-desc">{{$fillwith}} {{$fillext}}</p>
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user