MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into 1502-altpager-default

Browse source 
Conflicts:
	mod/admin.php
This commit is contained in:
Michael Vogel 2015-02-08 13:26:28 +01:00
parent 1d48ab0191 b4dc344f9c
commit 8871591a98
7 changed files with 31 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
mod/admin.php
View file

@ -373,7 +373,7 @@ function admin_page_site_post(&$a){
$singleuser = ((x($_POST,'singleuser')) ? notags(trim($_POST['singleuser'])) : '');
$proxy_disabled = ((x($_POST,'proxy_disabled')) ? True : False);
$old_pager = ((x($_POST,'old_pager')) ? True : False);
$disable_noscrape = ((x($_POST,'disable_noscrape')) ? true : false);
if($ssl_policy != intval(get_config('system','ssl_policy'))) {
if($ssl_policy == SSL_POLICY_FULL) {
q("update `contact` set
@ -502,7 +502,6 @@ function admin_page_site_post(&$a){
set_config('system','basepath', $basepath);
set_config('system','proxy_disabled', $proxy_disabled);
set_config('system','old_pager', $old_pager);
set_config('system','disable_noscrape', $disable_noscrape);
info( t('Site settings updated.') . EOL);
goaway($a->get_baseurl(true) . '/admin/site' );
@ -671,8 +670,6 @@ function admin_page_site(&$a) {
'$old_pager' => array('old_pager', t("Enable old style pager"), get_config('system','old_pager'), t("The old style pager has page numbers but slows down massively the page speed.")),
'$relocate_url' => array('relocate_url', t("New base url"), $a->get_baseurl(), "Change base url for this server. Sends relocate message to all DFRN contacts of all users."),
'$disable_noscrape'=> array('disable_noscrape', t("Disable noscrape"), get_config('system','disable_noscrape'), t("The noscrape feature speeds up directory submissions by using JSON data instead of HTML scraping. Disabling it will cause higher load on your server and the directory server.")),
'$form_security_token' => get_form_security_token("admin_site")
));

5
mod/friendica.php
View file

@ -38,11 +38,8 @@ function friendica_init(&$a) {
'site_name' => $a->config['sitename'],
'platform' => FRIENDICA_PLATFORM,
'info' => ((x($a->config,'info')) ? $a->config['info'] : ''),
'no_scrape_url' => $a->get_baseurl().'/noscrape'
);
//Enable noscrape?
if(!get_config('system','disable_noscrape'))
$data['no_scrape_url'] = $a->get_baseurl().'/noscrape';
echo json_encode($data);
killme();

3
mod/noscrape.php
View file

@ -2,9 +2,6 @@
function noscrape_init(&$a) {
if(get_config('system','disable_noscrape'))
killme();
if($a->argc > 1)
$which = $a->argv[1];
else

30
view/fr/messages.po
View file

@ -20,8 +20,8 @@ msgstr ""
"Project-Id-Version: friendica\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-02-04 11:35+0100\n"
"PO-Revision-Date: 2015-02-05 09:47+0000\n"
"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
"PO-Revision-Date: 2015-02-06 00:14+0000\n"
"Last-Translator: Damien Goutte-Gattat <damien+transifex@incenp.org>\n"
"Language-Team: French (http://www.transifex.com/projects/p/friendica/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -622,19 +622,19 @@ msgstr "défaut"
#: ../../view/theme/clean/config.php:57
msgid "Midnight"
msgstr ""
msgstr "Minuit"
#: ../../view/theme/clean/config.php:58
msgid "Bootstrap"
msgstr ""
msgstr "Bootstrap"
#: ../../view/theme/clean/config.php:59
msgid "Shades of Pink"
msgstr ""
msgstr "Nuances de rose"
#: ../../view/theme/clean/config.php:60
msgid "Lime and Orange"
msgstr ""
msgstr "Lime et Orange"
#: ../../view/theme/clean/config.php:61
msgid "GeoCities Retro"
@ -642,29 +642,29 @@ msgstr ""
#: ../../view/theme/clean/config.php:85
msgid "Background Image"
msgstr ""
msgstr "Images de fond"
#: ../../view/theme/clean/config.php:85
msgid ""
"The URL to a picture (e.g. from your photo album) that should be used as "
"background image."
msgstr ""
msgstr "L'URL vers une image (de votre album de photo, p. ex.) qui devra être utilisée comme image de fond."
#: ../../view/theme/clean/config.php:86
msgid "Background Color"
msgstr ""
msgstr "Couleur de fond"
#: ../../view/theme/clean/config.php:86
msgid "HEX value for the background color. Don't include the #"
msgstr ""
msgstr "Valeur hexadécimale de la couleur de fond (sans le #)."
#: ../../view/theme/clean/config.php:88
msgid "font size"
msgstr ""
msgstr "taille de la police"
#: ../../view/theme/clean/config.php:88
msgid "base font size for your interface"
msgstr ""
msgstr "taille de base de la police pour votre interface"
#: ../../view/theme/duepuntozero/config.php:45
msgid "greenzero"
@ -6072,15 +6072,15 @@ msgstr "Il n'y a pas de conversation avec cet id."
#: ../../include/api.php:1614
msgid "Invalid request."
msgstr ""
msgstr "Requête invalide."
#: ../../include/api.php:1625
msgid "Invalid item."
msgstr ""
msgstr "Item invalide."
#: ../../include/api.php:1635
msgid "Invalid action. "
msgstr ""
msgstr "Action invalide."
#: ../../include/api.php:1643
msgid "DB error"

26
view/fr/strings.php
View file

@ -118,17 +118,17 @@ $a->strings["Set resize level for images in posts and comments (width and height
$a->strings["Set theme width"] = "Largeur du thème";
$a->strings["Set colour scheme"] = "Choisir le schéma de couleurs";
$a->strings["default"] = "défaut";
$a->strings["Midnight"] = "";
$a->strings["Bootstrap"] = "";
$a->strings["Shades of Pink"] = "";
$a->strings["Lime and Orange"] = "";
$a->strings["Midnight"] = "Minuit";
$a->strings["Bootstrap"] = "Bootstrap";
$a->strings["Shades of Pink"] = "Nuances de rose";
$a->strings["Lime and Orange"] = "Lime et Orange";
$a->strings["GeoCities Retro"] = "";
$a->strings["Background Image"] = "";
$a->strings["The URL to a picture (e.g. from your photo album) that should be used as background image."] = "";
$a->strings["Background Color"] = "";
$a->strings["HEX value for the background color. Don't include the #"] = "";
$a->strings["font size"] = "";
$a->strings["base font size for your interface"] = "";
$a->strings["Background Image"] = "Images de fond";
$a->strings["The URL to a picture (e.g. from your photo album) that should be used as background image."] = "L'URL vers une image (de votre album de photo, p. ex.) qui devra être utilisée comme image de fond.";
$a->strings["Background Color"] = "Couleur de fond";
$a->strings["HEX value for the background color. Don't include the #"] = "Valeur hexadécimale de la couleur de fond (sans le #).";
$a->strings["font size"] = "taille de la police";
$a->strings["base font size for your interface"] = "taille de base de la police pour votre interface";
$a->strings["greenzero"] = "";
$a->strings["purplezero"] = "";
$a->strings["easterbunny"] = "";
@ -1364,9 +1364,9 @@ $a->strings["Weekly posting limit of %d posts reached. The post was rejected."]
$a->strings["Monthly posting limit of %d posts reached. The post was rejected."] = "Le quota mensuel de %d publications a été atteint. La publication a été rejetée.";
$a->strings["There is no status with this id."] = "Il n'y a pas de statut avec cet id.";
$a->strings["There is no conversation with this id."] = "Il n'y a pas de conversation avec cet id.";
$a->strings["Invalid request."] = "";
$a->strings["Invalid item."] = "";
$a->strings["Invalid action. "] = "";
$a->strings["Invalid request."] = "Requête invalide.";
$a->strings["Invalid item."] = "Item invalide.";
$a->strings["Invalid action. "] = "Action invalide.";
$a->strings["DB error"] = "";
$a->strings["view full size"] = "voir en pleine taille";
$a->strings["Starts:"] = "Débute:";

2
view/templates/admin_aside.tpl
View file

@ -41,7 +41,7 @@
</ul>
<h4>{{$diagnosticstxt}}</h4>
<ul class'admin linklist'>
<ul class='admin linklist'>
<li class='admin link {{$admin.diagnostics_probe.2}}'><a href="{{$admin.diagnostics_probe.0}}">{{$admin.diagnostics_probe.1}}</a></li>
<li class='admin link {{$admin.diagnostics_webfinger.2}}'><a href="{{$admin.diagnostics_webfinger.0}}">{{$admin.diagnostics_webfinger.1}}</a></li>
</ul>

1
view/templates/admin_site.tpl
View file

@ -111,7 +111,6 @@
{{include file="field_checkbox.tpl" field=$suppress_language}}
<h3>{{$performance}}</h3>
{{include file="field_checkbox.tpl" field=$disable_noscrape}}
{{include file="field_checkbox.tpl" field=$use_fulltext_engine}}
{{include file="field_input.tpl" field=$itemcache}}
{{include file="field_input.tpl" field=$itemcache_duration}}