Merge pull request #5038 from tobiasd/20180519-3834

dont delete but remove from your stream

diff --git a/doc/themes.md b/doc/themes.md
index 59f9570ddc162ff8ed37b28bbd8b29607b2f1894..d0d74a92c6b6e2c4b32a37952ecf18c7e75ed989 100644 (file)
--- a/doc/themes.md
+++ b/doc/themes.md
@@ -167,6 +167,8 @@ The content of this file should be something like
 
     <?php
     /* meta informations for the theme, see below */
+    use Friendica\App;
+    
     function duepuntozero_lr_init(App $a) {
         $a-> theme_info = array(
             'extends' => 'duepuntozero'.
@@ -246,6 +248,12 @@ These three pieces of information should be listed.
 If the original author is no longer working on the theme, but a maintainer has taken over, the maintainer should be listed as well.
 The information from the theme header will be displayed in the admin panel.
 
+The first thing in file is to import the `App` class from `\Friendica\` namespace.
+
+    use Friendica\App;
+
+This will make our job a little easier, as we don't have to specify the full name every time we need to use the `App` class.
+
 The next crucial part of the theme.php file is a definition of an init function.
 The name of the function is <theme-name>_init.
 So in the case of quattro it is

diff --git a/src/Core/Console/AutomaticInstallation.php b/src/Core/Console/AutomaticInstallation.php
index 189bb9d19e970739146f575ad19aa6a802834256..e0eea1f507abf474a6f2d0fecbbd0a73b6ad2d04 100644 (file)
--- a/src/Core/Console/AutomaticInstallation.php
+++ b/src/Core/Console/AutomaticInstallation.php
@@ -6,6 +6,7 @@ use Asika\SimpleConsole\Console;
 use dba;
 use Friendica\App;
 use Friendica\Core\Install;
+use Friendica\Core\Theme;
 
 require_once 'mod/install.php';
 require_once 'include/dba.php';
@@ -90,6 +91,15 @@ HELP;
 
                $this->out(" Complete!\n\n");
 
+               // Install theme
+               $this->out("Installing theme\n");
+               if (!empty($a->config['system']['theme'])) {
+                       Theme::install($a->config['system']['theme']);
+                       $this->out(" Complete\n\n");
+               } else {
+                       $this->out(" Theme setting is empty. Please check the file htconfig.php\n\n");
+               }
+
                // Copy config file
                $this->out("Saving config file...\n");
                if ($config_file != '.htconfig.php' && !copy($config_file, '.htconfig.php')) {

diff --git a/view/lang/fi-fi/messages.po b/view/lang/fi-fi/messages.po
index 58d8e8a6a18bf47aa1d0b679664c420069936f70..f3ec6b7cc089de63579280779a330829eafc1d2a 100644 (file)
--- a/view/lang/fi-fi/messages.po
+++ b/view/lang/fi-fi/messages.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-05-09 15:04+0200\n"
-"PO-Revision-Date: 2018-05-11 17:25+0000\n"
+"PO-Revision-Date: 2018-05-12 12:34+0000\n"
 "Last-Translator: Kris\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/Friendica/friendica/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -5505,7 +5505,7 @@ msgstr "Nykyinen salasana:"
 
 #: mod/settings.php:1201 mod/settings.php:1202
 msgid "Your current password to confirm the changes"
-msgstr ""
+msgstr "Syötä nykyinen salasanasi vahvistaaksesi muutokset"
 
 #: mod/settings.php:1202
 msgid "Password:"
@@ -6804,7 +6804,7 @@ msgstr "Piilota tunnistelista julkaisun lopussa."
 
 #: mod/admin.php:1437
 msgid "Clean database"
-msgstr ""
+msgstr "Siivoa tietokanta"
 
 #: mod/admin.php:1437
 msgid ""
@@ -7690,7 +7690,7 @@ msgstr "Pika-aloitus"
 
 #: src/Core/UserImport.php:104
 msgid "Error decoding account file"
-msgstr ""
+msgstr "Tilitiedoston tulkinnassa tapahtui virhe"
 
 #: src/Core/UserImport.php:110
 msgid "Error! No version data in file! This is not a Friendica account file?"
@@ -8879,7 +8879,7 @@ msgstr "Tietokannan muokkauksessa tapahtui virheitä:"
 #: src/Database/DBStructure.php:210
 #, php-format
 msgid "%s: Database update"
-msgstr ""
+msgstr "%s: Tietokantapäivitys"
 
 #: src/Database/DBStructure.php:460
 #, php-format

diff --git a/view/lang/fi-fi/strings.php b/view/lang/fi-fi/strings.php
index d1eac9f844571ab33a64d0df6a4fc66780c8107c..16c3e9539fe379b312d6c40ae4e15bf4f5fbd6a5 100644 (file)
--- a/view/lang/fi-fi/strings.php
+++ b/view/lang/fi-fi/strings.php
@@ -1258,7 +1258,7 @@ $a->strings["Account Settings"] = "Tiliasetukset";
 $a->strings["Password Settings"] = "Salasana-asetukset";
 $a->strings["Leave password fields blank unless changing"] = "Jätä salasana kenttää tyhjäksi jos et halua vaihtaa salasanaa";
 $a->strings["Current Password:"] = "Nykyinen salasana:";
-$a->strings["Your current password to confirm the changes"] = "";
+$a->strings["Your current password to confirm the changes"] = "Syötä nykyinen salasanasi vahvistaaksesi muutokset";
 $a->strings["Password:"] = "Salasana:";
 $a->strings["Basic Settings"] = "Perusasetukset";
 $a->strings["Full Name:"] = "Koko nimi:";
@@ -1548,7 +1548,7 @@ $a->strings["Check upstream version"] = "";
 $a->strings["Enables checking for new Friendica versions at github. If there is a new version, you will be informed in the admin panel overview."] = "";
 $a->strings["Suppress Tags"] = "Piilota tunnisteet";
 $a->strings["Suppress showing a list of hashtags at the end of the posting."] = "Piilota tunnistelista julkaisun lopussa.";
-$a->strings["Clean database"] = "";
+$a->strings["Clean database"] = "Siivoa tietokanta";
 $a->strings["Remove old remote items, orphaned database records and old content from some other helper tables."] = "";
 $a->strings["Lifespan of remote items"] = "";
 $a->strings["When the database cleanup is enabled, this defines the days after which remote items will be deleted. Own items, and marked or filed items are always kept. 0 disables this behaviour."] = "";
@@ -1744,7 +1744,7 @@ $a->strings["Invite Friends"] = "Kutsu kavereita";
 $a->strings["Local Directory"] = "Paikallinen hakemisto";
 $a->strings["External link to forum"] = "Ulkoinen linkki foorumiin";
 $a->strings["Quick Start"] = "Pika-aloitus";
-$a->strings["Error decoding account file"] = "";
+$a->strings["Error decoding account file"] = "Tilitiedoston tulkinnassa tapahtui virhe";
 $a->strings["Error! No version data in file! This is not a Friendica account file?"] = "Virhe: tiedostosta puuttuu versiotiedot! Saattaa olla että tämä ei ole Friendica -tilitiedosto?";
 $a->strings["User '%s' already exists on this server!"] = "Käyttäjä '%s' on jo olemassa tällä palvelimella!";
 $a->strings["User creation error"] = "Virhe käyttäjän luomisessa";
@@ -2032,7 +2032,7 @@ $a->strings["\n\t\t\t\tThe friendica developers released update %s recently,\n\t
 $a->strings["The error message is\n[pre]%s[/pre]"] = "Virheviesti on\n[pre]%s[/pre]";
 $a->strings["\nError %d occurred during database update:\n%s\n"] = "\n%d virhe tapahtui tietokannan päivityksen aikana:\n%s\n";
 $a->strings["Errors encountered performing database changes: "] = "Tietokannan muokkauksessa tapahtui virheitä:";
-$a->strings["%s: Database update"] = "";
+$a->strings["%s: Database update"] = "%s: Tietokantapäivitys";
 $a->strings["%s: updating %s table."] = "%s: päivitetään %s-taulukkoa.";
 $a->strings["[no subject]"] = "[ei aihetta]";
 $a->strings["Starts:"] = "Alkaa:";

diff --git a/view/lang/pl/messages.po b/view/lang/pl/messages.po
index e2d177d761c581096c343259590d98937e43ac25..a8d249e66212e5b89929e6eaf034ffe44e362c2e 100644 (file)
--- a/view/lang/pl/messages.po
+++ b/view/lang/pl/messages.po
@@ -39,7 +39,7 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-05-09 15:04+0200\n"
-"PO-Revision-Date: 2018-05-11 21:45+0000\n"
+"PO-Revision-Date: 2018-05-12 17:21+0000\n"
 "Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -8999,11 +8999,11 @@ msgstr "Usuń wydarzenie"
 
 #: src/Model/Event.php:815
 msgid "D g:i A"
-msgstr ""
+msgstr "D g:m AM/PM"
 
 #: src/Model/Event.php:816
 msgid "g:i A"
-msgstr ""
+msgstr "g:m AM/PM"
 
 #: src/Model/Event.php:901 src/Model/Event.php:903
 msgid "Show map"

diff --git a/view/lang/pl/strings.php b/view/lang/pl/strings.php
index cf27e5989ec64a0ae9f52554efbf3c5630301c68..27b381f93046deb950560bb3060b956fed6ed2d7 100644 (file)
--- a/view/lang/pl/strings.php
+++ b/view/lang/pl/strings.php
@@ -2087,8 +2087,8 @@ $a->strings["l, F j"] = "d, M d ";
 $a->strings["Edit event"] = "Edytuj wydarzenie";
 $a->strings["Duplicate event"] = "Zduplikowane zdarzenie";
 $a->strings["Delete event"] = "Usuń wydarzenie";
-$a->strings["D g:i A"] = "";
-$a->strings["g:i A"] = "";
+$a->strings["D g:i A"] = "D g:m AM/PM";
+$a->strings["g:i A"] = "g:m AM/PM";
 $a->strings["Show map"] = "Pokaż mapę";
 $a->strings["Hide map"] = "Ukryj mapę";
 $a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Skasowana grupa o tej nazwie została przywrócona. Istniejące uprawnienia do pozycji <strong>mogą</strong> dotyczyć tej grupy i wszystkich przyszłych członków. Jeśli nie jest to zamierzone, utwórz inną grupę o innej nazwie.";