Merge pull request #311 from annando/1509-new-directory

Use the new directory setting (valid for 3.4.2)

diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php
index 5821453194a3b4129a5559816178dc369168845a..08d821128db7c34d3ce0507d2db4c40566ebf593 100644 (file)
--- a/jappixmini/jappixmini.php
+++ b/jappixmini/jappixmini.php
@@ -439,6 +439,9 @@ function jappixmini_script(&$a,&$s) {
 
     if(! local_user()) return;
 
+    if ($_GET["mode"] == "minimal")
+       return;
+
     $activate = get_pconfig(local_user(),'jappixmini','activate');
     $dontinsertchat = get_pconfig(local_user(), 'jappixmini','dontinsertchat');
     if (!$activate or $dontinsertchat) return;

diff --git a/rendertime/rendertime.php b/rendertime/rendertime.php
index 213ed316aa479d22b340ee889206071d4a4d9a34..d104f12b1fdbbc1e14638df6d65d7740d956ee26 100755 (executable)
--- a/rendertime/rendertime.php
+++ b/rendertime/rendertime.php
@@ -26,7 +26,7 @@ function rendertime_page_end(&$a, &$o) {
 
        $duration = microtime(true)-$a->performance["start"];
 
-       if (is_site_admin())
+       if (is_site_admin() AND ($_GET["mode"] != "minimal"))
                $o = $o.'<div class="renderinfo">'.sprintf(t("Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, Other: %s, Total: %s"),
                                                round($a->performance["database"], 3),
                                                round($a->performance["network"], 3),

diff --git a/testdrive/lang/pl/messages.po b/testdrive/lang/pl/messages.po
index 1cf6ed5fd1e4bd9bb1a22638a294d73f34bc2111..c0a091b17a4d3c4e99c78546342e903e620afdeb 100644 (file)
--- a/testdrive/lang/pl/messages.po
+++ b/testdrive/lang/pl/messages.po
@@ -9,10 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-23 14:45+0200\n"
-"PO-Revision-Date: 2014-10-05 14:38+0000\n"
-"Last-Translator: TORminator <f3754b9a@opayq.com>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/friendica/language/pl/)\n"
+"POT-Creation-Date: 2015-08-23 17:30+0200\n"
+"PO-Revision-Date: 2015-08-24 08:34+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -37,5 +37,5 @@ msgstr "Twoje testowe konto Friendica za chwilę wygaśnie."
 msgid ""
 "Hi %1$s,\n"
 "\n"
-"Your test account on %2$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at http://dir.friendica.com/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."
-msgstr "Witaj %1$s,\n\nTwoje konto testowe na %2$s wygaśnie za mniej niż pięć dni. Mamy nadzieję, że Ci się podobało i wkrótce zarejestrujesz się na zawsze na jednej ze stron Friendica. Lista stron dostępnych publicznie jest dostępna w http://dir.friendica.com/siteinfo. Po więcej informacji o zakładaniu własnego serwera, odwiedź proszę stronę http://friendica.com."
+"Your test account on %2$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at %s/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."
+msgstr ""

diff --git a/testdrive/lang/pl/strings.php b/testdrive/lang/pl/strings.php
index 3875b54f1b46147e26d7f03e44b8d4aa23d2a8f2..6d774b604915dc6da0e95f158edd9ca3f344129e 100644 (file)
--- a/testdrive/lang/pl/strings.php
+++ b/testdrive/lang/pl/strings.php
@@ -8,4 +8,4 @@ function string_plural_select_pl($n){
 $a->strings["Administrator"] = "Administrator";
 $a->strings["Your account on %s will expire in a few days."] = "Twoje konto w  %s wygaśnie w ciągu kilku dni.";
 $a->strings["Your Friendica test account is about to expire."] = "Twoje testowe konto Friendica za chwilę wygaśnie.";
-$a->strings["Hi %1\$s,\n\nYour test account on %2\$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at http://dir.friendica.com/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."] = "Witaj %1\$s,\n\nTwoje konto testowe na %2\$s wygaśnie za mniej niż pięć dni. Mamy nadzieję, że Ci się podobało i wkrótce zarejestrujesz się na zawsze na jednej ze stron Friendica. Lista stron dostępnych publicznie jest dostępna w http://dir.friendica.com/siteinfo. Po więcej informacji o zakładaniu własnego serwera, odwiedź proszę stronę http://friendica.com.";
+$a->strings["Hi %1\$s,\n\nYour test account on %2\$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at %s/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."] = "";