fixed bugs

Author: AidasK

README.md

@@ -1,9 +1,11 @@
 ![Laravel-Lang-Import-Export v6](https://raw.githubusercontent.com/AidasK/laravel-lang-import-export/master/logo.png)
 
-Laravel-Lang-Import-Export
+Laravel-Lang-Import-Export Refactored
 ==========================
 
-This package provides artisan commands to import and export language files from and to CSV. This can be used to send translations to agencies that normally work with Excel-like files.
+This package provides artisan commands to import and export language files from and to CSV. This can be used to send translations to agencies that normally work with Excel-like files. In practice, CSV format is supper easy to work with for any translator in Fiverr or for any other freelancer. Personally, I have tried every other format such as *php, yaml, docx, pod, txt* and all of them has too complex syntax and requires custom software to work with (Not to mention all those problems with file encodings). CSV solves it all. 
+
+# How It Works? 
 
 It turns some navigation.php file...
 
@@ -45,8 +47,6 @@ Installation
     composer require aidask/laravel-lang-import-export
 ```
 
-Run `composer update` to install the package.
-
 This package uses Laravel 5.5 Package Auto-Discovery.
 For previous versions of Laravel, you need to update `config/app.php` by adding an entry for the service provider:
 
@@ -66,8 +66,8 @@ The package currently provides two commands, one for exporting the files and one
 
 ```bash
 php artisan lang:export --locale en
-php artisan lang:export --locale en --target fr  # export en translations only missing in fr locale
-php artisan lang:export -z all.zip  # archive all the files
+php artisan lang:export --locale en --target fr,de,pt  # export en translations only missing in fr,de,pt locales. Each in separate files
+php artisan lang:export -l fr,de,pt -z all.zip  # archive all the files
 php artisan lang:export --locale en -g paggination,validation  # export only cretain groups 
 ```
 
@@ -100,6 +100,9 @@ php artisan lang:import
 Changelog
 ------------
 
+6.1.0
+* Validate placeholders feature
+
 6.0.0
 * refactor whole repository
 

src/Console/ExportToCsvCommand.php

@@ -46,11 +46,13 @@ class ExportToCsvCommand extends Command
      */
     public function handle()
     {
-        foreach ($this->strToArray($this->option('locale')) as $locale) {
-            foreach ($this->strToArray($this->option('target'), [null]) as $target) {
-                $translations = $this->getTranslations($locale, $target);
-                $this->saveTranslations($locale, $target, $translations);
-                $this->info(strtoupper($locale) . strtoupper($target ?: '') . ' Translations saved to: ' . $this->getOutputFileName($locale, $target));
+        $exportLocales = $this->option('locale') ?: config('lang_import_export.export_locale');
+        $targetLocales = $this->option('target') ?: config('lang_import_export.export_target');
+        foreach ($this->strToArray($exportLocales) as $exportLocale) {
+            foreach ($this->strToArray($targetLocales, [null]) as $targetLocale) {
+                $translations = $this->getTranslations($exportLocale, $targetLocale);
+                $this->saveTranslations($exportLocale, $targetLocale, $translations);
+                $this->info(strtoupper($exportLocale) . strtoupper($targetLocale ?: '') . ' Translations saved to: ' . $this->getOutputFileName($exportLocale, $targetLocale));
             }
         }
         if ($zipName = $this->option('zip')) {
@@ -107,6 +109,7 @@ private function getTranslations($locale, $target = null)
      * @param $target
      * @param $translations
      * @return void
+     * @throws \Exception
      */
     private function saveTranslations($locale, $target, $translations)
     {
@@ -115,6 +118,10 @@ private function saveTranslations($locale, $target, $translations)
         $this->saveTranslationsToFile($output, $translations);
 
         $this->closeFile($output);
+
+        if ($this->option('excel')) {
+            $this->adjustToExcel($this->getOutputFileName($locale, $target));
+        }
     }
 
     /**
@@ -161,12 +168,7 @@ private function saveTranslationsToFile($output, $translations)
     /**
      * Put content of file to specified file with CSV parameters.
      *
-     * @param FilePointerResource $output
-     * @param string $group
-     * @param string $key
-     * @param string $value
      * @return void
-     *
      */
     private function writeFile()
     {
@@ -178,16 +180,12 @@ private function writeFile()
     /**
      * Close output file and check if adjust file to Excel format.
      *
-     * @param FilePointerResource $output
+     * @param resource $output
      * @return void
      */
     private function closeFile($output)
     {
         fclose($output);
-
-        if ($this->option('excel')) {
-            $this->adjustToExcel();
-        }
     }
 
     /**
@@ -196,11 +194,13 @@ private function closeFile($output)
      * @return void
      *
      */
-    private function adjustToExcel()
+    private function adjustToExcel($fileName)
     {
-        $data = file_get_contents($this->option('output'));
-        file_put_contents($this->option('output'),
-            chr(255) . chr(254) . mb_convert_encoding($data, 'UTF-16LE', 'UTF-8'));
+        $data = file_get_contents($fileName);
+        file_put_contents(
+            $fileName,
+            chr(255) . chr(254) . mb_convert_encoding($data, 'UTF-16LE', 'UTF-8')
+        );
     }
 
     /**
@@ -210,7 +210,7 @@ private function adjustToExcel()
      */
     private function getOutputFileName($locale, $target = null)
     {
-        $fileName = $this->option('output');
+        $fileName = $this->option('output') ?: config('lang_import_export.export_path');
         $fileName = str_replace(':locale', $locale, $fileName);
         $fileName = str_replace(':target', $target, $fileName);
         return $fileName;

src/LangListService.php

@@ -143,7 +143,7 @@ private function getTranslations($locale, $group, $new_translations)
         return $translations;
     }
 
-    private function validatePlaceholders($targetTranslations, $baseTranslations)
+    public function validatePlaceholders($targetTranslations, $baseTranslations)
     {
         foreach ($targetTranslations as $group => $translations) {
             foreach ($translations as $key => $translation) {

src/config/lang_import_export.php

@@ -1,6 +1,8 @@
 <?php
 return [
     'base_locale' => 'en',
+    'export_locale' => 'en',// locale list separated by comma
+    'export_target' => null,
     'base_group' => null, // all groups or comma separated list
     'export_path' => storage_path(':locale:target.csv'),
 ];