Merge pull request #6 from ava007/wnk_translation_cakephp36

Wnk translation cakephp36

Author: ava007

README.md

@@ -1,5 +1,5 @@
 
-# Translation Plugin for CakePHP 3
+# Translation Plugin for CakePHP 3.6
 
 It provides translation services for pot files:
 
@@ -27,6 +27,16 @@ Configure::write('WnkTranslation', [
     'tablePrefix' => '',     // optional prefix for database tables
 ]);
 ```
+### src/Application.php
+```
+class Application //extends BaseApplication {
+
+  public function bootstrap() {
+    parent::bootstrap();
+    $this->addPlugin('WnkTranslation');
+  }
+}
+```
 ### Database
 
 run the appropriate sql-ddl-script:
@@ -36,9 +46,12 @@ run the appropriate sql-ddl-script:
 
 After installation the plugins is called used the following url:
 
-http://....domainname/wnk_translation/translations/index
+http://....domainname/wnk-translation/translations/cockpit
 
 
 ## References
 
+
+
 visit https://www.locavores.co/wnk-translation/translations/index to see this plugin in action
+

composer.json

@@ -3,15 +3,14 @@
     "description": "Translation plugin for CakePHP",
     "type": "cakephp-plugin",
     "require": {
-        "php": ">=5.4.16",
-        "cakephp/cakephp": ">=3.0"
+        "cakephp/cakephp": ">=3.6"
     },
     "require-dev": {
         "phpunit/phpunit": "*"
     },
     "autoload": {
         "psr-4": {
-            "WnkTranslation\\": "src"
+            "WnkTranslation\\": "src/"
         }
     },
     "autoload-dev": {

config/routes.php

@@ -1,6 +1,11 @@
 <?php
+use Cake\Routing\RouteBuilder;
 use Cake\Routing\Router;
+use Cake\Routing\Route\DashedRoute;
 
-Router::plugin('WnkTranslation', function ($routes) {
-    $routes->fallbacks('DashedRoute');
-});
+Router::plugin('WnkTranslation', 
+   ['path' => '/wnk-translation'],
+   function (RouteBuilder $routes) {
+     $routes->fallbacks(DashedRoute::class);
+   }
+);

ddl-postgresql.sql

@@ -19,3 +19,5 @@ CREATE TABLE wnk_translation_proposed (
     msgstr text
     CONSTRAINT status CHECK ( status IN ( 'ProposedByUser', 'AcceptedByAdmin') )   
 ) with (oids = false);
+
+create unique index wnk_translation_unique on wnk_translation (msgid,locale);

src/Controller/Component/UtltransComponent.php

@@ -134,12 +134,14 @@ function export() {
 
         // Step 4: export default.pot file to the relevant directory
 
-        $wnk_translation = Configure::read('WnkTranslation');
+       $msg = 'export: wrote to ' . ROOT. DS. 'src'.DS.'Locale' ;   // for msg to end user
+       
+       $wnk_translation = Configure::read('WnkTranslation');
 
-        $filename= 'f' . gmdate('YmdHis');
+       $filename= 'f' . gmdate('YmdHis');
 
-        // iterate through all configured languages:
-        foreach ($wnk_translation['trans_lang'] as $k):
+       // iterate through all configured languages:
+       foreach ($wnk_translation['trans_lang'] as $k):
             if ($k == $wnk_translation['default_lang']) continue;
 
             $path = ROOT.DS.'src'.DS.'Locale'.DS.$k;
@@ -177,8 +179,9 @@ function export() {
             if (file_exists($path.DS.'default.po')) 
                unlink ($path.DS.'default.po');
             rename ($path.DS.$filename,$path.DS.'default.po');
+            $msg .= ' (' . $k . ': ' . $z. ')';
         endforeach;
-        return 'Export successful with ' . $z . ' Records';
+        return 'Export successful ended. ' . $msg;
    }
 
   /*

…oller/ProposedtranslationsController.php …roller/TranslationproposedController.phpsrc/Controller/ProposedtranslationsController.php renamed to src/Controller/TranslationproposedController.php src/Controller/ProposedtranslationsController.php renamed to src/Controller/TranslationproposedController.php

@@ -1,5 +1,5 @@
 <?php
-namespace WnkProposedtranslation\Controller;
+namespace WnkTranslation\Controller;
 
 use WnkTranslation\Controller\AppController;
 use Cake\Core\Configure;
@@ -11,7 +11,7 @@
  *
  * @property \WnkTranslation\Model\Table\TranslationsTable $Translations
  */
-class ProposedtranslationsController extends AppController
+class TranslationproposedController extends AppController
 {
 
     public function initialize()
@@ -27,16 +27,15 @@ public function initialize()
      */
     public function add($id = null)
     {
-        $translation = $this->Translations->get($id, [
-            'contain' => []
-        ]);
+        $this->loadModel('WnkTranslation.Translations');
+        $translation = $this->Translations->get($id);
         $this->set('translation', $translation);
         $this->set('_serialize', ['translation']);
 
         if ($this->request->is('post')) {
-            $translation = $this->Proposedtranslations->newEntity();
-            $translation = $this->Proposedtranslations->patchEntity($translation, $this->request->data);
-            if ($this->Proposedtranslations->save($translation)) {
+            $translation = $this->Translationproposed->newEntity();
+            $translation = $this->Translationproposed->patchEntity($translation, $this->request->data);
+            if ($this->Translationproposed->save($translation)) {
                 $this->Flash->success(__('The translation has been saved.'));
                 return $this->redirect(['action' => 'index']);
             } else {

src/Controller/TranslationsController.php

@@ -30,23 +30,25 @@ public function index()
     {
 
         $where = array();
-        if (!empty($this->request->getQuery['locale']))
-            $where['locale'] = $this->request->getQuery['locale'];
+
+        if (!empty($this->request->getQuery('locale')))
+            $where['locale'] = $this->request->getQuery('locale');
         if (!empty($this->request->data['locale']))
             $where['locale'] = $this->request->data['locale'];
 
-        if (!empty($this->request->getQuery['msgstr']))
-            $where['msgstr like'] = '%' . $this->request->getQuery['msgstr'] . '%';
+        if (!empty($this->request->getQuery('msgstr')))
+            $where['msgstr like'] = '%' . $this->request->getQuery('msgstr') . '%';
         if (!empty($this->request->data['msgstr']))
             $where['msgstr like'] = '%' . $this->request->data['msgstr'] . '%';
 
-        if (!empty($this->request->getQuery['status']))
-            $where['status'] = $this->request->getQuery['status'];
+        if (!empty($this->request->getQuery('status')))
+            $where['status'] = $this->request->getQuery('status');
+
         if (!empty($this->request->data['status']))
             $where['status'] = $this->request->data['status'];
 
         $query = $this->Translations->find()->where($where);
-
+           
         $this->set('translations', $this->paginate($query));
         $this->set('_serialize', ['translations']);
         $this->set('WnkTranslation', Configure::read('WnkTranslation'));
@@ -72,13 +74,13 @@ public function cockpit()
             $table = $wnkConf['tablePrefix'] . $table;
 
         $q = "select locale,status,count(*) as cnt from " . $table;
-        $q.= "where locale in (select distinct locale where status ='Original') ";
+        $q.= " where locale in (select distinct locale where status ='Original') ";
         $q.= "group by locale,status order by 1,2 ";
         $tset = $conn->execute($q)->fetchAll('assoc');
         $this->set('original', $tset);   
 
         $q = "select locale,status,count(*) as cnt from " . $table;
-        $q.= "where locale NOT in (select distinct locale where status ='Original') ";
+        $q.= " where locale NOT in (select distinct locale where status ='Original') ";
         $q.= "group by locale,status order by 1,2 ";
         $tset = $conn->execute($q)->fetchAll('assoc');
         $this->set('tsets', $tset);   
@@ -215,4 +217,14 @@ public function googletranslate() {
             return $this->redirect(['action' => 'index']);
         }
     }
+    
+    public function deleteunused()
+    {
+        $this->autoRender = false;
+        $rc = $this->Translations->deleteunused();
+        $this->Flash->success(__('del ended.') . ' ' . $rc);
+        return $this->redirect(['action' => 'cockpit']);
+    }
+
+    
 }

src/Model/Entity/Translation.php

@@ -27,7 +27,11 @@ class Translation extends Entity
      * @var array
      */
     protected $_accessible = [
-        '*' => true,
-        'id' => false,
+        'msgid' => true,
+        'locale' => true,
+        'created' => true,
+        'last_used' => true,
+        'status' => true,
+        'msgstr' => true
     ];
 }

src/Model/Entity/TranslationProposed.php

@@ -0,0 +1,37 @@
+<?php
+namespace WnkTranslation\Model\Entity;
+
+use Cake\ORM\Entity;
+
+/**
+ * WnkTranslationProposed Entity
+ *
+ * @property string $id
+ * @property string $msgid
+ * @property string $locale
+ * @property string $status
+ * @property \Cake\I18n\Time $created
+ * @property string $createdbyip
+ * @property string $msgstr
+ */
+class TranslationProposed extends Entity
+{
+
+    /**
+     * Fields that can be mass assigned using newEntity() or patchEntity().
+     *
+     * Note that when '*' is set to true, this allows all unspecified fields to
+     * be mass assigned. For security purposes, it is advised to set '*' to false
+     * (or remove it), and explicitly make individual fields accessible as needed.
+     *
+     * @var array
+     */
+    protected $_accessible = [
+        'msgid' => true,
+        'locale' => true,
+        'status' => true,
+        'created' => true,
+        'createdbyip' => true,
+        'msgstr' => true
+    ];
+}

src/Model/Table/TranslationProposedTable.php

@@ -0,0 +1,90 @@
+<?php
+namespace WnkTranslation\Model\Table;
+
+use Cake\ORM\Query;
+use Cake\ORM\RulesChecker;
+use Cake\ORM\Table;
+use Cake\Validation\Validator;
+
+/**
+ * WnkTranslationProposed Model
+ *
+ * @method \WnkTranslation\Model\Entity\WnkTranslationProposed get($primaryKey, $options = [])
+ * @method \WnkTranslation\Model\Entity\WnkTranslationProposed newEntity($data = null, array $options = [])
+ * @method \WnkTranslation\Model\Entity\WnkTranslationProposed[] newEntities(array $data, array $options = [])
+ * @method \WnkTranslation\Model\Entity\WnkTranslationProposed|bool save(\Cake\Datasource\EntityInterface $entity, $options = [])
+ * @method \WnkTranslation\Model\Entity\WnkTranslationProposed|bool saveOrFail(\Cake\Datasource\EntityInterface $entity, $options = [])
+ * @method \WnkTranslation\Model\Entity\WnkTranslationProposed patchEntity(\Cake\Datasource\EntityInterface $entity, array $data, array $options = [])
+ * @method \WnkTranslation\Model\Entity\WnkTranslationProposed[] patchEntities($entities, array $data, array $options = [])
+ * @method \WnkTranslation\Model\Entity\WnkTranslationProposed findOrCreate($search, callable $callback = null, $options = [])
+ *
+ * @mixin \Cake\ORM\Behavior\TimestampBehavior
+ */
+class TranslationProposedTable extends Table
+{
+
+    /**
+     * Initialize method
+     *
+     * @param array $config The configuration for the Table.
+     * @return void
+     */
+    public function initialize(array $config)
+    {
+        parent::initialize($config);
+        
+          $wnkConf = Configure::read('WnkTranslation');
+        if (isset($wnkConf['tablePrefix']))
+            $table = $wnkConf['tablePrefix'] . 'wnk_translation_proposed';
+        else
+            $table = 'wnk_translation';
+            
+        $this->setTable($table);
+        
+        $this->setDisplayField('id');
+        $this->setPrimaryKey('id');
+
+        $this->addBehavior('Timestamp');
+    }
+
+    /**
+     * Default validation rules.
+     *
+     * @param \Cake\Validation\Validator $validator Validator instance.
+     * @return \Cake\Validation\Validator
+     */
+    public function validationDefault(Validator $validator)
+    {
+        $validator
+            ->scalar('id')
+            ->maxLength('id', 36)
+            ->allowEmpty('id', 'create');
+
+        $validator
+            ->scalar('msgid')
+            ->maxLength('msgid', 255)
+            ->requirePresence('msgid', 'create')
+            ->notEmpty('msgid');
+
+        $validator
+            ->scalar('locale')
+            ->maxLength('locale', 2)
+            ->allowEmpty('locale');
+
+        $validator
+            ->scalar('status')
+            ->maxLength('status', 24)
+            ->allowEmpty('status');
+
+        $validator
+            ->scalar('createdbyip')
+            ->maxLength('createdbyip', 41)
+            ->allowEmpty('createdbyip');
+
+        $validator
+            ->scalar('msgstr')
+            ->allowEmpty('msgstr');
+
+        return $validator;
+    }
+}