0ct0pu5/yellow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Language update

Browse source
This commit is contained in:
markseu 2016-03-04 09:53:30 +01:00
parent 80ca597e6c
commit 8fcd309279
9 changed files with 48 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
content/1-home/page.txt
View file

@ -4,4 +4,4 @@ Title: Home
Your website works!
You can now [edit this page] or use your text editor.
For more information see [Yellow documentation](https://github.com/datenstrom/yellow/wiki).
For more information see [Yellow help](http://developers.datenstrom.se/help/).

2
system/config/config.ini
View file

@ -31,7 +31,7 @@ ContentDefaultFile: page.txt
ContentPagination: page
ContentExtension: .txt
ConfigExtension: .ini
TextFile: language-(.*).ini
TextFile: language-(.*).txt
ErrorFile: page-error-(.*).txt
RobotsFile: robots.txt
IconFile: icon.png

2
system/plugins/commandline.php
View file

@ -16,7 +16,7 @@ class YellowCommandline
function onLoad($yellow)
{
$this->yellow = $yellow;
$this->yellow->config->setDefault("commandlineVersionUrl", "https://github.com/datenstrom/yellow-extensions");
$this->yellow->config->setDefault("commandlineVersionUrl", "https://github.com/datenstrom/yellow-plugins");
}
// Handle command

4
system/plugins/core.php
View file

@ -55,7 +55,7 @@ class YellowCore
$this->config->setDefault("contentExtension", ".txt");
$this->config->setDefault("configExtension", ".ini");
$this->config->setDefault("configFile", "config.ini");
$this->config->setDefault("textFile", "language-(.*).ini");
$this->config->setDefault("textFile", "language-(.*).txt");
$this->config->setDefault("errorFile", "page-error-(.*).txt");
$this->config->setDefault("robotsFile", "robots.txt");
$this->config->setDefault("iconFile", "icon.png");
@ -77,7 +77,7 @@ class YellowCore
echo "Yellow ".YellowCore::Version.", PHP ".PHP_VERSION.", $serverSoftware<br>\n";
}
$this->config->load($this->config->get("configDir").$this->config->get("configFile"));
$this->text->load($this->config->get("configDir").$this->config->get("textFile"));
$this->text->load($this->config->get("pluginDir").$this->config->get("textFile"));
date_default_timezone_set($this->config->get("serverTime"));
list($pathRoot, $pathHome) = $this->lookup->getContentInformation();
$this->config->set("contentRootDir", $pathRoot);

6
system/config/language-de.ini → system/plugins/language-de.txt
View file

@ -3,7 +3,7 @@
Language: de
LanguageDescription: Deutsch
LanguageAuthor: David Fehrmann
LanguageVersion: 0.6.1
LanguageVersion: 0.6.2
BlogBy: von
BlogFilter: Blog:
@ -43,8 +43,8 @@ WebinterfaceDelete: -
WebinterfaceCreateTitle: Neue Seite
WebinterfaceDeleteTitle: Seite löschen
WebinterfaceUserHelp: Hilfe
WebinterfaceUserHelpUrl: https://github.com/datenstrom/yellow/wiki/Home-de
WebinterfaceUserAccountUrl: https://github.com/datenstrom/yellow/wiki/How-to-add-a-user-account
WebinterfaceUserHelpUrl: http://developers.datenstrom.se/help/help-de
WebinterfaceUserAccountUrl: http://developers.datenstrom.se/help/how-to-add-a-user-account-de
WebinterfaceUserLogout: Abmelden
WikiFilter: Wiki:
WikiTag: Tags:

6
system/config/language-en.ini → system/plugins/language-en.txt
View file

@ -3,7 +3,7 @@
Language: en
LanguageDescription: English
LanguageAuthor: Mark Seuffert
LanguageVersion: 0.6.1
LanguageVersion: 0.6.2
BlogBy: by
BlogFilter: Blog:
@ -43,8 +43,8 @@ WebinterfaceDelete: -
WebinterfaceCreateTitle: New page
WebinterfaceDeleteTitle: Delete page
WebinterfaceUserHelp: Help
WebinterfaceUserHelpUrl: https://github.com/datenstrom/yellow/wiki
WebinterfaceUserAccountUrl: https://github.com/datenstrom/yellow/wiki/How-to-add-a-user-account
WebinterfaceUserHelpUrl: http://developers.datenstrom.se/help/
WebinterfaceUserAccountUrl: http://developers.datenstrom.se/help/how-to-add-a-user-account
WebinterfaceUserLogout: Logout
WikiFilter: Wiki:
WikiTag: Tags:

6
system/config/language-fr.ini → system/plugins/language-fr.txt
View file

@ -3,7 +3,7 @@
Language: fr
LanguageDescription: Français
LanguageAuthor: Juh Nibreh
LanguageVersion: 0.6.1
LanguageVersion: 0.6.2
BlogBy: par
BlogFilter: Blog:
@ -43,8 +43,8 @@ WebinterfaceDelete: -
WebinterfaceCreateTitle: Nouvelle page
WebinterfaceDeleteTitle: Supprimer page
WebinterfaceUserHelp: Aide
WebinterfaceUserHelpUrl: https://github.com/datenstrom/yellow/wiki/Home-fr
WebinterfaceUserAccountUrl: https://github.com/datenstrom/yellow/wiki/How-to-add-a-user-account
WebinterfaceUserHelpUrl: http://developers.datenstrom.se/help/help-fr
WebinterfaceUserAccountUrl: http://developers.datenstrom.se/help/how-to-add-a-user-account-fr
WebinterfaceUserLogout: Déconnexion
WikiFilter: Wiki:
WikiTag: Tags:

19
system/plugins/language.php Normal file
View file

@ -0,0 +1,19 @@
<?php
// Copyright (c) 2013-2016 Datenstrom, http://datenstrom.se
// This file may be used and distributed under the terms of the public license.
// Language plugin
class YellowLanguage
{
const Version = "0.6.2";
var $yellow; //access to API
// Handle initialisation
function onLoad($yellow)
{
$this->yellow = $yellow;
}
}
$yellow->plugins->register("language", "YellowLanguage", YellowLanguage::Version);
?>

25
system/themes/flatsite.css
View file

@ -1,4 +1,4 @@
/* Flatsite theme 0.6.1 */
/* Flatsite theme 0.6.3 */
/* Designer: Mark Mayberg */
@import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,700);
@ -22,8 +22,9 @@ a, img { border:none; text-decoration:none; }
.sitename { display:block; float:left; }
.sitename h1 { margin:0; }
.sitename h1 a { color:#111; text-decoration:none; }
.with-sidebar .main { margin-right:13em; }
.with-sidebar .sidebar { float:right; width:12em; margin-top:4.3em; overflow:hidden; }
.with-sidebar .main { margin-right:17em; }
.with-sidebar .sidebar { float:right; width:14em; margin-top:4.3em; overflow:hidden; }
.with-sidebar .sidebar { float:right; width:16em; margin-top:5em; overflow:hidden; font-size:0.9em; }
.content h1:first-child, .content>*:first-child { margin-top:0; }
.content h1 a:hover { text-decoration:none; }
.content img { max-width:100%; height:auto; }
@ -31,15 +32,19 @@ a, img { border:none; text-decoration:none; }
.content table { border-spacing:0; border-collapse:collapse; }
.content th { text-align:left; padding:0.3em; border-bottom:1px solid #ddd;}
.content td { text-align:left; padding:0.3em; border-top:1px solid #ddd;}
.content .flexible { position:relative; padding-bottom:56.25%; padding-top:30px; }
.content .flexible { position:relative; padding-top:0; padding-bottom:56.25%; }
.content .flexible iframe { position:absolute; top:0; left:0; width:100%; height:100%; }
.content .toc { margin:0; padding:0; list-style:none; }
.content .pagination { margin:1em 0; }
.content code { border:1px solid #ddd; border-radius:3px; padding:0 0.5em; }
.content pre>code { border:none; padding:0; }
.content pre { overflow:auto; }
.content .fourpages { margin:0; padding:0; list-style:none; width:100%; }
.content .fourpages li { padding-bottom:1em; text-align:center; vertical-align:top; display:inline-block; width:24%; }
.content blockquote { margin-left:0; padding-left:1em; border-left:.5em solid #0a0; }
.content blockquote blockquote { margin-left:-1.5em; border-left:.5em solid #fb0; }
.content blockquote blockquote blockquote { border-color:#d00; }
.content code, pre { font-family:Consolas,"Liberation Mono",Menlo,Courier,monospace; font-size:90%;}
.content code { padding:0.15em 0.4em; margin:0; background-color:#f7f7f7; border-radius:3px; }
.content pre>code { padding:0; margin:0; white-space:pre; background:transparent; border:0; font-size:inherit; }
.content pre { padding:1em; overflow:auto; line-height:1.45; background-color:#f7f7f7; border-radius:3px; }
.content .threepages { margin:0; padding:0; list-style:none; width:100%; }
.content .threepages li { padding-bottom:1em; text-align:center; vertical-align:top; display:inline-block; width:32%; }
.footer { margin-top:2em; clear:both; }
.footer a { color:#07d; }
.footer a:hover { color:#07d; text-decoration:underline; }
@ -122,7 +127,7 @@ a, img { border:none; text-decoration:none; }
.sitename h1, h1, h2 { font-size:1.2em; }
.sitename h1, .header, .navigation, .footer, .page { margin:0; padding:0; }
.sitename, .navigation, .navigation-tree { float:none; }
.navigation-search { padding-top: 0.5em; }
.navigation-search { padding-top:0.5em; }
.with-sidebar .main { margin-right:0em; }
.with-sidebar .sidebar { display:none; }
}