Continued:

- language instance setting/getting is now done in non-monolithic
  FrameworkBootstrap and it makes more sense there, too
- updated core framework

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/application/city/class_ApplicationHelper.php b/application/city/class_ApplicationHelper.php
index 9156d8900f015f01499ff57db0e8cabbc504fa21..aad83886c51592253ae5d758022bfcde6c028102 100644 (file)
--- a/application/city/class_ApplicationHelper.php
+++ b/application/city/class_ApplicationHelper.php
@@ -146,7 +146,7 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
                $languageInstance = ObjectFactory::createObjectByConfiguredName('language_system_class');
 
                // And set it here
-               $this->setLanguageInstance($languageInstance);
+               FrameworkBootstrap::setLanguageInstance($languageInstance);
 
                // Is html request?
                if (FrameworkBootstrap::getRequestTypeFromSystem() == 'html') {

diff --git a/application/city/classes/commands/html/class_CityHtmlConfirmCommand.php b/application/city/classes/commands/html/class_CityHtmlConfirmCommand.php
index e6ae502ad13d5f79259dd99663f23f84d61ac938..888875684cfdf49c0be3ee5d30ec337fdefa3050 100644 (file)
--- a/application/city/classes/commands/html/class_CityHtmlConfirmCommand.php
+++ b/application/city/classes/commands/html/class_CityHtmlConfirmCommand.php
@@ -3,6 +3,7 @@
 namespace Org\Mxchange\City\Command;
 
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 use Org\Mxchange\CoreFramework\Command\BaseCommand;
 use Org\Mxchange\CoreFramework\Command\Commandable;
 use Org\Mxchange\CoreFramework\Controller\Controller;
@@ -111,7 +112,7 @@ class CityHtmlConfirmCommand extends BaseCommand implements Commandable {
                $templateInstance->loadCodeTemplate($masterTemplate);
 
                // Set title
-               $templateInstance->assignVariable('title', $this->getLanguageInstance()->getMessage('page_confirm_link_title'));
+               $templateInstance->assignVariable('title', FrameworkBootstrap::getLanguageInstance()->getMessage('page_confirm_link_title'));
 
                // Get user instance
                try {

diff --git a/application/city/classes/commands/html/class_CityHtmlLoginAreaCommand.php b/application/city/classes/commands/html/class_CityHtmlLoginAreaCommand.php
index bfa8ca1d42a541675f61b665c90c2812840617fa..70ae9d4ed16bbfb44e198adec4ae75d62174ebd0 100644 (file)
--- a/application/city/classes/commands/html/class_CityHtmlLoginAreaCommand.php
+++ b/application/city/classes/commands/html/class_CityHtmlLoginAreaCommand.php
@@ -3,6 +3,7 @@
 namespace Org\Mxchange\City\Command;
 
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 use Org\Mxchange\CoreFramework\Controller\Controller;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
@@ -141,7 +142,7 @@ class CityHtmlLoginAreaCommand extends BaseCommand implements Commandable {
                $templateInstance->loadCodeTemplate($masterTemplate);
 
                // Set title
-               $templateInstance->assignVariable('title', $this->getLanguageInstance()->getMessage($this->actionName . '_title'));
+               $templateInstance->assignVariable('title', FrameworkBootstrap::getLanguageInstance()->getMessage($this->actionName . '_title'));
 
                // Construct the menu in every command. We could do this in BaseCommand class. But this means
                // *every* command has a navigation system and that is want we don't want.

diff --git a/application/city/classes/commands/html/class_CityHtmlLoginCommand.php b/application/city/classes/commands/html/class_CityHtmlLoginCommand.php
index cf31dc8e7021e2c70097fa76f6b84334cc6703b2..7446134ee316648724835083755bd623faa36f61 100644 (file)
--- a/application/city/classes/commands/html/class_CityHtmlLoginCommand.php
+++ b/application/city/classes/commands/html/class_CityHtmlLoginCommand.php
@@ -3,6 +3,7 @@
 namespace Org\Mxchange\City\Command;
 
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 use Org\Mxchange\CoreFramework\Command\BaseCommand;
 use Org\Mxchange\CoreFramework\Command\Commandable;
 use Org\Mxchange\CoreFramework\Controller\Controller;
@@ -113,7 +114,7 @@ class CityHtmlLoginCommand extends BaseCommand implements Commandable, Registera
                $templateInstance->loadCodeTemplate($masterTemplate);
 
                // Set title
-               $templateInstance->assignVariable('title', $this->getLanguageInstance()->getMessage('page_login_title'));
+               $templateInstance->assignVariable('title', FrameworkBootstrap::getLanguageInstance()->getMessage('page_login_title'));
 
                /*
                 * Construct the menu in every command. We could do this in BaseCommand class. But this means

diff --git a/application/city/classes/commands/html/class_CityHtmlLoginFailedCommand.php b/application/city/classes/commands/html/class_CityHtmlLoginFailedCommand.php
index 4b61af971a657290c2cfbdb69a6ab93b1c7d3db6..ce21d184696184606d4985b6dcd0cf10cd6cd757 100644 (file)
--- a/application/city/classes/commands/html/class_CityHtmlLoginFailedCommand.php
+++ b/application/city/classes/commands/html/class_CityHtmlLoginFailedCommand.php
@@ -3,6 +3,7 @@
 namespace Org\Mxchange\City\Command;
 
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 use Org\Mxchange\CoreFramework\Command\BaseCommand;
 use Org\Mxchange\CoreFramework\Command\Commandable;
 use Org\Mxchange\CoreFramework\Controller\Controller;
@@ -106,7 +107,7 @@ class CityHtmlLoginFailedCommand extends BaseCommand implements Commandable {
                $templateInstance->loadCodeTemplate($masterTemplate);
 
                // Set title
-               $templateInstance->assignVariable('title', $this->getLanguageInstance()->getMessage('login_failed_title'));
+               $templateInstance->assignVariable('title', FrameworkBootstrap::getLanguageInstance()->getMessage('login_failed_title'));
 
                // Assign base URL
                $templateInstance->assignConfigVariable('base_url');

diff --git a/application/city/classes/commands/html/class_CityHtmlLogoutDoneCommand.php b/application/city/classes/commands/html/class_CityHtmlLogoutDoneCommand.php
index 0c5ee613528d42a9b448dfcf2aec591f1055aa3a..d9dac7ae98d0a3f0ab98d6ea1b1833c69d914380 100644 (file)
--- a/application/city/classes/commands/html/class_CityHtmlLogoutDoneCommand.php
+++ b/application/city/classes/commands/html/class_CityHtmlLogoutDoneCommand.php
@@ -3,6 +3,7 @@
 namespace Org\Mxchange\City\Command;
 
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 use Org\Mxchange\CoreFramework\Command\BaseCommand;
 use Org\Mxchange\CoreFramework\Command\Commandable;
 use Org\Mxchange\CoreFramework\Controller\Controller;
@@ -106,7 +107,7 @@ class CityHtmlLogoutDoneCommand extends BaseCommand implements Commandable {
                $templateInstance->loadCodeTemplate($masterTemplate);
 
                // Set title
-               $templateInstance->assignVariable('title', $this->getLanguageInstance()->getMessage('logout_done_title'));
+               $templateInstance->assignVariable('title', FrameworkBootstrap::getLanguageInstance()->getMessage('logout_done_title'));
 
                // Assign base URL
                $templateInstance->assignConfigVariable('base_url');

diff --git a/core b/core
index df3701b7230349ee2bc711caba98809ac943363c..8a70226bd287a3f13b27932e2ec88d16c51c7e39 160000 (submodule)
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit df3701b7230349ee2bc711caba98809ac943363c
+Subproject commit 8a70226bd287a3f13b27932e2ec88d16c51c7e39