Updated to 1.0.9 version

Author: josantonius

.gitattributes

@@ -1,8 +1,8 @@
 /resources export-ignore
-/public/js/vue export-ignore
-/public/js/eliasis-complement.js export-ignore
-/public/sass export-ignore
-/public/images export-ignore
+/src/public/js/vue export-ignore
+/src/public/js/eliasis-complement.js export-ignore
+/src/public/sass export-ignore
+/src/public/images export-ignore
 /tests export-ignore
 /lib export-ignore
 .gitattributes export-ignore

CHANGELOG.md

@@ -42,6 +42,7 @@
 * Added `Eliasis\Complement\ComplementHandler->_setComplementParams()` method.
 * Added `Eliasis\Complement\ComplementHandler->_getSettings()` method.
 * Added `Eliasis\Complement\ComplementHandler->_setImage()` method.
+* Added `Eliasis\Complement\ComplementHandler->_getLanguage()` method.
 * Added `Eliasis\Complement\ComplementHandler->_getType()` method.
 * Added `Eliasis\Complement\ComplementHandler->_addRoutes()` method.
 
@@ -90,12 +91,12 @@
 * Deleted `public/sass/eliasis-module.sass` file.
 * Deleted `public/template/eliasis-module.php` file.
 
-* Added `public/css/eliasis-complement-min.css` file.
-* Added `public/js/eliasis-complement.js` file.
-* Added `public/js/eliasis-complement-min.js` file.
-* Added `public/sass/partials/_complements.sass` file.
-* Added `public/sass/eliasis-complement.sass` file.
-* Added `public/template/eliasis-complement.php` file.
+* Added `src/public/css/eliasis-complement-min.css` file.
+* Added `src/public/js/eliasis-complement.js` file.
+* Added `src/public/js/eliasis-complement-min.js` file.
+* Added `src/public/sass/partials/_complements.sass` file.
+* Added `src/public/sass/eliasis-complement.sass` file.
+* Added `src/public/template/eliasis-complement.php` file.
 
 * Added `Eliasis/Complement/after_set_states` hook in `Eliasis\Complement\ComplementState` trait.
 

public/js/eliasis-complement-min.js

@@ -239,6 +239,18 @@ private function _setComplementParams($complement, $path) {
 
         $default['folder'] = $default['slug'] . App::DS;
 
+        $lang = $this->_getLanguage();
+
+        if (isset($complement['name'][$lang])) {
+
+            $complement['name'] = $complement['name'][$lang];
+        }
+
+        if (isset($complement['description'][$lang])) {
+            
+            $complement['description'] = $complement['description'][$lang];
+        }
+
         $this->complement = array_merge($default, $complement);
 
         $this->_setImage();
@@ -277,6 +289,24 @@ private function _getSettings() {
         $this->complement['path']['config'] = $_config;
     }
 
+    /**
+     * Gets the current locale.
+     *
+     * @since 1.0.9
+     *
+     * @uses string get_locale() → gets the current locale in WordPress
+     *
+     * @return void
+     */
+    private function _getLanguage() {
+
+        $wpLang = (function_exists('get_locale')) ? get_locale() : null;
+
+        $browserLang = @$_SERVER['HTTP_ACCEPT_LANGUAGE'] ?: null;
+
+        return  substr($wpLang ?: $browserLang ?: 'en', 0, 2);
+    }
+
     /**
      * Set image url.
      *
@@ -310,9 +340,9 @@ private function _setImage() {
 
         $directory = $complementUrl . $slug . '/' . $file;
 
-        $repository = rtrim($this->complement['url-import'], '/') . "/$file";
+        $repository = rtrim($this->complement['url-import'], '/')."/$file";
 
-        $default = $url . 'master/public/images/default.png';
+        $default = $url . 'master/src/public/images/default.png';
 
         if (File::exists($filepath)) {
 

src/Traits/ComplementHandler.php

@@ -48,8 +48,8 @@ public function getRepositoryVersion() {
 
         $version = $this->complement['version'];
 
-        if (!isset($this->complement['config-url'])) { return $version; }     
-
+        if (!isset($this->complement['config-url'])) { return $version; }
+            
         if (!File::exists($this->complement['config-url'])) {
 
             return $version;

src/Traits/ComplementImport.php

@@ -99,9 +99,11 @@ public static function requestHandler($complementType) {
      */
     private static function _loadExternalComplements() {
 
+        $complement = self::_getType();
+        
         $external = json_decode($_GET['external'], true);
 
-        $complements = array_keys(self::$instances[App::$id]);
+        $complements = array_keys(self::$instances[App::$id][$complement]);
 
         foreach ($external as $complement => $url) {
 

src/Traits/ComplementRequest.php

@@ -61,9 +61,9 @@ private function _setFile($filename, $type, $pathUrl) {
 
             $path = self::getLibraryPath();
 
-            $fromPath = $path . 'public' .$DS. $ext .$DS. "$filename.$ext";
+            $from = $path.'src'.$DS.'public'.$DS.$ext.$DS."$filename.$ext";
 
-            $file = file_get_contents($fromPath);
+            $file = file_get_contents($from);
 
             file_put_contents($toPath, $file);
         }
@@ -96,6 +96,7 @@ private function _renderizate($filter, $external, $sort) {
             'app'        => App::$id,
             'complement' => self::_getType('strtolower', false),
             'filter'     => $filter,
+            'language'   => $this->_getLanguage(),
             'external'   => urlencode(json_encode($external, true)),
             'sort'       => $sort,
         ];
@@ -104,7 +105,7 @@ private function _renderizate($filter, $external, $sort) {
 
         $path = self::getLibraryPath();
 
-        $template = $path . 'public' . App::DS . 'template' . App::DS;
+        $template = $path.'src'.App::DS.'public'.App::DS.'template'.App::DS;
 
         $View->renderizate($template, 'eliasis-complement', $data);
     }