Page MenuHomeDevCentral
Files F12591172

D3863.id10003.diff
No OneTemporary
Actions

D3863.id10003.diff
View Options

diff --git a/workspaces/src/Engines/Apps/ApplicationConfiguration.php b/workspaces/src/Engines/Apps/ApplicationConfiguration.php
--- a/workspaces/src/Engines/Apps/ApplicationConfiguration.php
+++ b/workspaces/src/Engines/Apps/ApplicationConfiguration.php
@@ -17,10 +17,9 @@
namespace Waystone\Workspaces\Engines\Apps;
+use Waystone\Workspaces\Engines\I18n\Message;
use Waystone\Workspaces\Engines\Serialization\ArrayDeserializable;
-use Message;
-
/**
* Application configuration class
*
diff --git a/workspaces/src/Engines/Auth/AuthenticationMethod.php b/workspaces/src/Engines/Auth/AuthenticationMethod.php
--- a/workspaces/src/Engines/Auth/AuthenticationMethod.php
+++ b/workspaces/src/Engines/Auth/AuthenticationMethod.php
@@ -20,6 +20,8 @@
use Waystone\Workspaces\Engines\Auth\Actions\AddToGroupUserAction;
use Waystone\Workspaces\Engines\Auth\Actions\GivePermissionUserAction;
use Waystone\Workspaces\Engines\Framework\Context;
+use Waystone\Workspaces\Engines\I18n\Language;
+use Waystone\Workspaces\Engines\I18n\Message;
use Waystone\Workspaces\Engines\Serialization\ArrayDeserializableWithContext;
use Waystone\Workspaces\Engines\Users\User;
@@ -27,9 +29,6 @@
use Keruald\OmniTools\DataTypes\Option\Option;
use Keruald\OmniTools\DataTypes\Option\Some;
-use Language;
-use Message;
-
use Exception;
use InvalidArgumentException;
diff --git a/workspaces/src/Engines/Auth/Methods/AzharProvider.php b/workspaces/src/Engines/Auth/Methods/AzharProvider.php
--- a/workspaces/src/Engines/Auth/Methods/AzharProvider.php
+++ b/workspaces/src/Engines/Auth/Methods/AzharProvider.php
@@ -18,8 +18,7 @@
namespace Waystone\Workspaces\Engines\Auth\Methods;
use Waystone\Workspaces\Engines\Auth\AuthenticationMethod;
-
-use Language;
+use Waystone\Workspaces\Engines\I18n\Language;
use stdClass;
diff --git a/workspaces/src/includes/i18n/Language.php b/workspaces/src/Engines/I18n/Language.php
rename from workspaces/src/includes/i18n/Language.php
rename to workspaces/src/Engines/I18n/Language.php
--- a/workspaces/src/includes/i18n/Language.php
+++ b/workspaces/src/Engines/I18n/Language.php
@@ -15,9 +15,15 @@
* @filesource
*/
+namespace Waystone\Workspaces\Engines\I18n;
+
use Waystone\Workspaces\Engines\Controller\LoadableWithContext;
use Waystone\Workspaces\Engines\Framework\Context;
+use Smarty\Smarty;
+
+use InvalidArgumentException;
+
/**
* Language services
*/
@@ -100,9 +106,10 @@
/**
* Gets a common lang spoken by the site and the user's browser
- * @see Language::getHttpAcceptLanguages
*
* @return string the language
+ * @see Language::getHttpAcceptLanguages
+ *
*/
public static function findLanguage () {
if (file_exists('lang') && is_dir('lang')) {
@@ -116,8 +123,9 @@
//The array $langs contains now the language available.
//Gets the langs the user should want:
- if (!$userlangs = static::getHttpAcceptLanguages())
+ if (!$userlangs = static::getHttpAcceptLanguages()) {
return;
+ }
//Gets the intersection between the both languages arrays
//If it matches, returns first result
@@ -130,8 +138,9 @@
//by default return en-US and not en or fr-BE and not fr, so second pass
foreach ($userlangs as $userlang) {
$lang = explode('-', $userlang);
- if (count($lang) > 1)
+ if (count($lang) > 1) {
$userlangs2[] = $lang[0];
+ }
}
$intersect = array_intersect($userlangs2, $langs);
if (count($intersect)) {
diff --git a/workspaces/src/includes/i18n/Message.php b/workspaces/src/Engines/I18n/Message.php
rename from workspaces/src/includes/i18n/Message.php
rename to workspaces/src/Engines/I18n/Message.php
--- a/workspaces/src/includes/i18n/Message.php
+++ b/workspaces/src/Engines/I18n/Message.php
@@ -15,10 +15,15 @@
* @filesource
*/
+namespace Waystone\Workspaces\Engines\I18n;
+
+use Exception;
+
/**
* Represents a localizable message
*/
class Message {
+
/**
* @var Array the localized message
*/
diff --git a/workspaces/src/includes/i18n/TextFileMessage.php b/workspaces/src/Engines/I18n/TextFileMessage.php
rename from workspaces/src/includes/i18n/TextFileMessage.php
rename to workspaces/src/Engines/I18n/TextFileMessage.php
--- a/workspaces/src/includes/i18n/TextFileMessage.php
+++ b/workspaces/src/Engines/I18n/TextFileMessage.php
@@ -15,10 +15,15 @@
* @filesource
*/
+namespace Waystone\Workspaces\Engines\I18n;
+
+use Exception;
+
/**
* Represents a localizable message stored in a plain text file
*/
class TextFileMessage extends Message {
+
/**
* @var string The folder where the message is stored.
*/
diff --git a/workspaces/src/Engines/Workspaces/Workspace.php b/workspaces/src/Engines/Workspaces/Workspace.php
--- a/workspaces/src/Engines/Workspaces/Workspace.php
+++ b/workspaces/src/Engines/Workspaces/Workspace.php
@@ -19,12 +19,12 @@
use Waystone\Workspaces\Engines\Errors\ErrorHandling;
use Waystone\Workspaces\Engines\Framework\Context;
+use Waystone\Workspaces\Engines\I18n\Language;
use Waystone\Workspaces\Engines\Users\User;
use Keruald\OmniTools\Collections\Vector;
use Cache;
-use Language;
use Exception;
use LogicException;
diff --git a/workspaces/src/apps/documents/DocumentsApplication.php b/workspaces/src/apps/documents/DocumentsApplication.php
--- a/workspaces/src/apps/documents/DocumentsApplication.php
+++ b/workspaces/src/apps/documents/DocumentsApplication.php
@@ -17,6 +17,7 @@
use Waystone\Workspaces\Engines\Apps\Application;
use Waystone\Workspaces\Engines\Errors\ErrorHandling;
+use Waystone\Workspaces\Engines\I18n\Language;
/**
* Documents application class
diff --git a/workspaces/src/controllers/help.php b/workspaces/src/controllers/help.php
--- a/workspaces/src/controllers/help.php
+++ b/workspaces/src/controllers/help.php
@@ -20,6 +20,8 @@
// HTML output
//
+use Waystone\Workspaces\Engines\I18n\Language;
+
$file = $Config['Content']['Help'] . DIRECTORY_SEPARATOR;
$file .= (count($context->url) > 1) ? $context->url[1] : 'index';
$file .= '.html';
diff --git a/workspaces/src/controllers/home.php b/workspaces/src/controllers/home.php
--- a/workspaces/src/controllers/home.php
+++ b/workspaces/src/controllers/home.php
@@ -17,6 +17,7 @@
*/
use Waystone\Workspaces\Engines\Controller\Controller;
+use Waystone\Workspaces\Engines\I18n\Language;
/**
* Homepage controller
diff --git a/workspaces/src/includes/autoload.php b/workspaces/src/includes/autoload.php
--- a/workspaces/src/includes/autoload.php
+++ b/workspaces/src/includes/autoload.php
@@ -52,10 +52,6 @@
if ($name == 'CacheMemcached') { require $dir . '/includes/cache/memcached.php'; return true; }
if ($name == 'CacheVoid') { require $dir . '/includes/cache/void.php'; return true; }
- if ($name == 'Language') { require $dir . '/includes/i18n/Language.php'; return true; }
- if ($name == 'Message') { require $dir . '/includes/i18n/Message.php'; return true; }
- if ($name == 'TextFileMessage') { require $dir . '/includes/i18n/TextFileMessage.php'; return true; }
-
if ($name == 'Disclaimer') { require $dir . '/includes/objects/Disclaimer.php'; return true; }
if ($name == 'UserGroup') { require $dir . '/includes/objects/usergroup.php'; return true; }
diff --git a/workspaces/src/includes/objects/Disclaimer.php b/workspaces/src/includes/objects/Disclaimer.php
--- a/workspaces/src/includes/objects/Disclaimer.php
+++ b/workspaces/src/includes/objects/Disclaimer.php
@@ -16,6 +16,9 @@
*
*/
+use Waystone\Workspaces\Engines\I18n\Language;
+use Waystone\Workspaces\Engines\I18n\TextFileMessage;
+
/**
* Disclaimer class
*/
diff --git a/workspaces/src/index.php b/workspaces/src/index.php
--- a/workspaces/src/index.php
+++ b/workspaces/src/index.php
@@ -20,6 +20,7 @@
use Waystone\Workspaces\Engines\Apps\ApplicationContext;
use Waystone\Workspaces\Engines\Errors\ErrorHandling;
use Waystone\Workspaces\Engines\Framework\Application;
+use Waystone\Workspaces\Engines\I18n\Language;
use Waystone\Workspaces\Engines\Workspaces\Workspace;
////////////////////////////////////////////////////////////////////////////////

File Metadata

Mime Type
text/plain
Expires
Wed, Nov 12, 18:19 (5 h, 42 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3160606
Default Alt Text
D3863.id10003.diff (8 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator