feat: exclude group

Author: AidasK

README.md

@@ -68,20 +68,22 @@ The package currently provides two commands, one for exporting the files and one
 php artisan lang:export --locale en
 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 
+php artisan lang:export --locale en -g pagination,validation  # export only cretain groups 
+php artisan lang:export --locale en --exclude pagination,validation  # export all files except pagination and validation
 ```
 
 ### Import
 ```bash
 php artisan lang:import es.csv # localed autodetected from file name
 php artisan lang:import espaniol.csv -l es
-php artisan lang:import espaniol.csv -l es -g paggination,validation # import only cretain groups
-php artisan lang:import es.csv -p # validate imported translations for missing placeholders (see below)
+php artisan lang:import espaniol.csv -l es -g pagination,validation # import only cretain groups
+php artisan lang:import es.csv -p --html # validate imported translations for missing placeholders and bad html (see below)
+php artisan lang:import es.xls -p --column-map A,B,D # import translations from different column. E.g. C column was left with base language
 ```
 
 ### Validate
 ```bash
-php artisan lang:validate ar -m --html -v
+php artisan lang:validate ar -m --html -v # find missing keys, bad html and placeholders
 ```
 ![Laravel-Lang-Import-Export validation example](https://raw.githubusercontent.com/AidasK/laravel-lang-import-export/master/validation.png)
 

src/Console/ExportToCsvCommand.php

@@ -18,7 +18,8 @@ class ExportToCsvCommand extends Command
     protected $signature = 'lang:export 
     						{--l|locale= : The locales to be exported. Separated by comma (default - base locale from config).} 
     						{--t|target= : Target languages, only missing keys are exported. Separated by comma.} 
-    						{--g|group= : The name of translation file to export (default - base group from config).} 
+    						{--g|group= : The names of translation files to export (default - group from config).} 
+    						{--exclude= : The names of translation files to exclude (default - group from config).} 
     						{--o|output= : Filename of exported translation, :locale, :target is replaced (default - export_path from config).} 
     						{--z|zip= : Zip all files.}
     						{--X|excel : Set file encoding for Excel (optional, default - UTF-8).}
@@ -89,10 +90,11 @@ private function strToArray($string, $fallback = [])
      */
     private function getTranslations($locale, $target = null)
     {
-        $group = $this->option('group') ?: config('lang_import_export.base_group');
-        $from = LangListService::loadLangList($locale, $group);
+        $group = $this->option('group') ?: config('lang_import_export.groups');
+        $exclude = $this->option('exclude') ?: config('lang_import_export.exclude_groups');
+        $from = LangListService::loadLangList($locale, $group, $exclude);
         if ($target) {
-            $targetList = LangListService::loadLangList($target, $group);
+            $targetList = LangListService::loadLangList($target, $group, $exclude);
             foreach ($targetList as $group => $translations) {
                 foreach ($translations as $key => $v) {
                     unset($from[$group][$key]);

src/Console/ValidationCommand.php

@@ -18,7 +18,8 @@ class ValidationCommand extends Command
     protected $signature = 'lang:validate 
                             {target? : Locale to be checked.} 
     						{--l|locale= : Base locale (default - base locale from config).} 
-    						{--g|group= : The name of translation file to export (default - base group from config).}
+    						{--g|group= : The names of translation files to validate (default - group from config).}
+    						{--exclude= : The names of translation files to be excluded (default - group from config).}
     						{--html : Compare HTML}
     						{--m|missing : Show missing translations}
     						';
@@ -39,14 +40,15 @@ class ValidationCommand extends Command
     public function handle()
     {
         $baseLocale = $this->option('locale') ?: config('lang_import_export.base_locale');
-        $groups = $this->option('group') ?: config('lang_import_export.base_group');
-        $baseTranslations = LangListService::loadLangList($baseLocale, $groups);
+        $groups = $this->option('group') ?: config('lang_import_export.groups');
+        $exclude = $this->option('exclude') ?: config('lang_import_export.exclude_groups');
+        $baseTranslations = LangListService::loadLangList($baseLocale, $groups, $exclude);
         $target = $this->argument('target');
         if (empty($target)) {
             $this->error('--target is required');
         }
         foreach ($this->strToArray($target) as $locale) {
-            $targetTranslations = LangListService::loadLangList($locale, $groups);
+            $targetTranslations = LangListService::loadLangList($locale, $groups, $exclude);
             $this->validatePlaceholders($targetTranslations, $baseTranslations, $locale);
             if ($this->option('html')) {
                 $this->validateHTML($targetTranslations, $baseTranslations, $locale);

src/LangListService.php

@@ -15,24 +15,27 @@ class LangListService
      *
      * @param string $locale
      * @param string $group
+     * @param string $excludeGroups
      * @return array
      */
-    public function loadLangList($locale, $group)
+    public function loadLangList($locale, $group, $excludeGroups = '')
     {
+        $exclude = explode(',', $excludeGroups);
         $result = [];
         if ($this->isGroupList($group)) {
             $groups = explode(',', $group);
-            foreach ($groups as $group) {
-                $result[$group] = $this->getGroup($locale, $group);
+        } else {
+            $path = resource_path('lang/' . $locale . '/');
+            $files = $this->getAllFiles($path);
+            $groups = [];
+            foreach ($files as $file) {
+                $groups[] = substr($file->getRealPath(), strlen($path), -4);
             }
-            return $result;
         }
-
-        $path = resource_path('lang/' . $locale . '/');
-        $files = $this->getAllFiles($path);
-        foreach ($files as $file) {
-            $file_path = substr($file->getRealPath(), strlen($path), -4);
-            $result[$file_path] = $this->getGroup($locale, $file_path);
+        foreach ($groups as $group) {
+            if (!in_array($group, $exclude)) {
+                $result[$group] = $this->getGroup($locale, $group);
+            }
         }
         return $result;
     }

src/config/lang_import_export.php

@@ -4,9 +4,10 @@
      * In practice export_locale value is 'en' and export_target is a list of all locales supported by your website
      */
     'base_locale' => 'en',
+    'groups' => null, // all groups or comma separated list (e.g. translation file names)
+    'exclude_groups' => null, // comma separated list
     'export_locale' => 'en',// locale list separated by comma
     'export_target' => null,// target locale list separated by comma
-    'base_group' => null, // all groups or comma separated list
     'export_path' => storage_path(':locale:target.csv'),
     'import_validate_placeholders' => false, // validate placeholders by default
     'import_validate_html' => false, // validate html by default