diff --git a/lib/commands/commands_list.dart b/lib/commands/commands_list.dart index 6585211a..d21259bd 100644 --- a/lib/commands/commands_list.dart +++ b/lib/commands/commands_list.dart @@ -1,4 +1,4 @@ -import 'impl/commads_export.dart'; +import 'impl/commands_export.dart'; import 'interface/command.dart'; final List commands = [ @@ -31,13 +31,13 @@ final List commands = [ class CommandParent extends Command { final String _name; final List _alias; - final List _childrens; - CommandParent(this._name, this._childrens, [this._alias = const []]); + final List _children; + CommandParent(this._name, this._children, [this._alias = const []]); @override String get commandName => _name; @override - List get childrens => _childrens; + List get children => _children; @override List get alias => _alias; diff --git a/lib/commands/impl/args_mixin.dart b/lib/commands/impl/args_mixin.dart index 4110599d..e5325443 100644 --- a/lib/commands/impl/args_mixin.dart +++ b/lib/commands/impl/args_mixin.dart @@ -94,7 +94,7 @@ mixin ArgsMixin { return ''; } - /// return [true] if conatains flags + /// return [true] if contains flags /// /// example run /// `get sort . --skipRename` diff --git a/lib/commands/impl/commads_export.dart b/lib/commands/impl/commands_export.dart similarity index 100% rename from lib/commands/impl/commads_export.dart rename to lib/commands/impl/commands_export.dart diff --git a/lib/commands/impl/create/controller/controller.dart b/lib/commands/impl/create/controller/controller.dart index 12207fb2..c2b7c773 100644 --- a/lib/commands/impl/create/controller/controller.dart +++ b/lib/commands/impl/create/controller/controller.dart @@ -29,7 +29,7 @@ class CreateControllerCommand extends Command { String? get hint => LocaleKeys.hint_create_controller.tr; @override - String get codeSample => 'get create controller:name [OPTINAL PARAMETERS] \n' + String get codeSample => 'get create controller:name [OPTIONAL PARAMETERS] \n' '${LocaleKeys.optional_parameters.trArgs(['[on, with]'])} '; @override bool validate() { diff --git a/lib/commands/impl/create/page/page.dart b/lib/commands/impl/create/page/page.dart index 024d33c5..7f375097 100644 --- a/lib/commands/impl/create/page/page.dart +++ b/lib/commands/impl/create/page/page.dart @@ -129,7 +129,7 @@ class CreatePageCommand extends Command { Structure.pathToDirImport(viewFile.path), ); LogService.success( - LocaleKeys.sucess_page_create.trArgs([name.pascalCase])); + LocaleKeys.success_page_create.trArgs([name.pascalCase])); } @override diff --git a/lib/commands/impl/create/project/project.dart b/lib/commands/impl/create/project/project.dart index 727584a8..337c95a0 100644 --- a/lib/commands/impl/create/project/project.dart +++ b/lib/commands/impl/create/project/project.dart @@ -7,7 +7,7 @@ import 'package:recase/recase.dart'; import '../../../../common/utils/logger/log_utils.dart'; import '../../../../common/utils/pubspec/pubspec_utils.dart'; -import '../../../../common/utils/shell/shel.utils.dart'; +import '../../../../common/utils/shell/shell.utils.dart'; import '../../../../core/internationalization.dart'; import '../../../../core/locales.g.dart'; import '../../../../core/structure.dart'; diff --git a/lib/commands/impl/generate/locales/locales.dart b/lib/commands/impl/generate/locales/locales.dart index 580312d4..d8d9619e 100644 --- a/lib/commands/impl/generate/locales/locales.dart +++ b/lib/commands/impl/generate/locales/locales.dart @@ -96,7 +96,7 @@ class GenerateLocalesCommand extends Command { path: '${_fileModel.path}.g.dart') .create(); - LogService.success(LocaleKeys.sucess_locale_generate.tr); + LogService.success(LocaleKeys.success_locale_generate.tr); } void _resolve(Map localization, Map result, diff --git a/lib/commands/impl/help/help.dart b/lib/commands/impl/help/help.dart index b50e14f5..d0b99582 100644 --- a/lib/commands/impl/help/help.dart +++ b/lib/commands/impl/help/help.dart @@ -30,7 +30,7 @@ $commandsHelp var result = ''; for (var command in commands) { result += '\n ${' ' * index} ${command.commandName}: ${command.hint}'; - result += _getCommandsHelp(command.childrens, index + 1); + result += _getCommandsHelp(command.children, index + 1); } return result; } diff --git a/lib/commands/impl/init/flutter/init.dart b/lib/commands/impl/init/flutter/init.dart index 1e546767..a63d3af1 100644 --- a/lib/commands/impl/init/flutter/init.dart +++ b/lib/commands/impl/init/flutter/init.dart @@ -2,7 +2,7 @@ import 'package:cli_menu/cli_menu.dart'; import '../../../../common/utils/logger/log_utils.dart'; import '../../../../common/utils/pubspec/pubspec_utils.dart'; -import '../../../../common/utils/shell/shel.utils.dart'; +import '../../../../common/utils/shell/shell.utils.dart'; import '../../../../core/internationalization.dart'; import '../../../../core/locales.g.dart'; import '../../../interface/command.dart'; diff --git a/lib/commands/impl/init/flutter/init_getxpattern.dart b/lib/commands/impl/init/flutter/init_getxpattern.dart index c136a5ab..536f017e 100644 --- a/lib/commands/impl/init/flutter/init_getxpattern.dart +++ b/lib/commands/impl/init/flutter/init_getxpattern.dart @@ -8,7 +8,7 @@ import '../../../../core/structure.dart'; import '../../../../functions/create/create_list_directory.dart'; import '../../../../functions/create/create_main.dart'; import '../../../../samples/impl/getx_pattern/get_main.dart'; -import '../../commads_export.dart'; +import '../../commands_export.dart'; import '../../install/install_get.dart'; Future createInitGetxPattern() async { @@ -28,5 +28,5 @@ Future createInitGetxPattern() async { ]); createListDirectory(initialDirs); - LogService.success(Translation(LocaleKeys.sucess_getx_pattern_generated)); + LogService.success(Translation(LocaleKeys.success_getx_pattern_generated)); } diff --git a/lib/commands/impl/init/flutter/init_katteko.dart b/lib/commands/impl/init/flutter/init_katteko.dart index 0a67f705..7de39515 100644 --- a/lib/commands/impl/init/flutter/init_katteko.dart +++ b/lib/commands/impl/init/flutter/init_katteko.dart @@ -9,7 +9,7 @@ import '../../../../functions/create/create_list_directory.dart'; import '../../../../functions/create/create_main.dart'; import '../../../../samples/impl/arctekko/arc_main.dart'; import '../../../../samples/impl/arctekko/config_example.dart'; -import '../../commads_export.dart'; +import '../../commands_export.dart'; import '../../install/install_get.dart'; Future createInitKatekko() async { @@ -38,5 +38,6 @@ Future createInitKatekko() async { ]); createListDirectory(initialDirs); - LogService.success(Translation(LocaleKeys.sucess_clean_Pattern_generated).tr); + LogService.success( + Translation(LocaleKeys.success_clean_Pattern_generated).tr); } diff --git a/lib/commands/impl/install/install.dart b/lib/commands/impl/install/install.dart index c48e3855..4537dab7 100644 --- a/lib/commands/impl/install/install.dart +++ b/lib/commands/impl/install/install.dart @@ -1,6 +1,6 @@ import '../../../common/utils/logger/log_utils.dart'; import '../../../common/utils/pubspec/pubspec_utils.dart'; -import '../../../common/utils/shell/shel.utils.dart'; +import '../../../common/utils/shell/shell.utils.dart'; import '../../../core/internationalization.dart'; import '../../../core/locales.g.dart'; import '../../../exception_handler/exceptions/cli_exception.dart'; diff --git a/lib/commands/impl/remove/remove.dart b/lib/commands/impl/remove/remove.dart index 354a661b..908b93fb 100644 --- a/lib/commands/impl/remove/remove.dart +++ b/lib/commands/impl/remove/remove.dart @@ -1,6 +1,6 @@ import '../../../common/utils/logger/log_utils.dart'; import '../../../common/utils/pubspec/pubspec_utils.dart'; -import '../../../common/utils/shell/shel.utils.dart'; +import '../../../common/utils/shell/shell.utils.dart'; import '../../../core/internationalization.dart'; import '../../../core/locales.g.dart'; import '../../../exception_handler/exceptions/cli_exception.dart'; diff --git a/lib/commands/impl/sort/sort.dart b/lib/commands/impl/sort/sort.dart index 7110a4d3..784e0e3b 100644 --- a/lib/commands/impl/sort/sort.dart +++ b/lib/commands/impl/sort/sort.dart @@ -60,7 +60,7 @@ class SortCommand extends Command { skipRename: containsArg('--skipRename'), useRelativeImport: containsArg('--relative')); LogService.success( - LocaleKeys.sucess_file_formatted.trArgs([element.path])); + LocaleKeys.success_file_formatted.trArgs([element.path])); } }); } @@ -72,7 +72,7 @@ class SortCommand extends Command { logger: false, skipRename: containsArg('--skipRename'), useRelativeImport: containsArg('--relative')); - LogService.success(LocaleKeys.sucess_file_formatted.trArgs([path])); + LogService.success(LocaleKeys.success_file_formatted.trArgs([path])); } else { throw CliException(LocaleKeys.error_invalid_dart.trArgs([path])); } diff --git a/lib/commands/impl/update/update.dart b/lib/commands/impl/update/update.dart index 8e9e772e..7754dea1 100644 --- a/lib/commands/impl/update/update.dart +++ b/lib/commands/impl/update/update.dart @@ -1,4 +1,4 @@ -import '../../../common/utils/shell/shel.utils.dart'; +import '../../../common/utils/shell/shell.utils.dart'; import '../../../core/internationalization.dart'; import '../../../core/locales.g.dart'; import '../../interface/command.dart'; diff --git a/lib/commands/interface/command.dart b/lib/commands/interface/command.dart index 7e0092c9..65b08bde 100644 --- a/lib/commands/interface/command.dart +++ b/lib/commands/interface/command.dart @@ -34,13 +34,13 @@ abstract class Command with ArgsMixin { bool validate() { if (GetCli.arguments.contains(commandName) || GetCli.arguments.contains('$commandName:$name')) { - var flagsNotAceppts = flags; - flagsNotAceppts.removeWhere((element) => acceptedFlags.contains(element)); - if (flagsNotAceppts.isNotEmpty) { + var flagsNotAccepts = flags; + flagsNotAccepts.removeWhere((element) => acceptedFlags.contains(element)); + if (flagsNotAccepts.isNotEmpty) { LogService.info(LocaleKeys.info_unnecessary_flag.trArgsPlural( - LocaleKeys.info_unnecessary_flag_prural, - flagsNotAceppts.length, - [flagsNotAceppts.toString()], + LocaleKeys.info_unnecessary_flag_plural, + flagsNotAccepts.length, + [flagsNotAccepts.toString()], )!); } @@ -61,6 +61,6 @@ abstract class Command with ArgsMixin { /// execute command Future execute(); - /// childrens command - List get childrens => []; + /// children command + List get children => []; } diff --git a/lib/common/utils/json_serialize/helpers.dart b/lib/common/utils/json_serialize/helpers.dart index a264ba51..2f68b39c 100644 --- a/lib/common/utils/json_serialize/helpers.dart +++ b/lib/common/utils/json_serialize/helpers.dart @@ -25,16 +25,16 @@ const Map PRIMITIVE_TYPES = { enum ListType { Object, String, Double, Int, Null } -class MergeableListType { +class MergeAbleListType { final ListType? listType; - final bool isAmbigous; + final bool isAmbiguous; - MergeableListType(this.listType, this.isAmbigous); + MergeAbleListType(this.listType, this.isAmbiguous); } -MergeableListType mergeableListType(List list) { +MergeAbleListType mergeAbleListType(List list) { ListType? t = ListType.Null; - var isAmbigous = false; + var isAmbiguous = false; for (var e in list) { ListType? inferredType; if (e.runtimeType.toString() == 'int') { @@ -47,11 +47,11 @@ MergeableListType mergeableListType(List list) { inferredType = ListType.Object; } if (t != ListType.Null && t != inferredType) { - isAmbigous = true; + isAmbiguous = true; } t = inferredType; } - return MergeableListType(t, isAmbigous); + return MergeAbleListType(t, isAmbiguous); } String camelCase(String text) { @@ -103,8 +103,8 @@ WithWarning mergeObj(Map obj, Map other, String path) { } else if (t == 'List') { var l = List.from(clone[k] as Iterable); l.addAll(other[k] as Iterable); - final mergeableType = mergeableListType(l); - if (ListType.Object == mergeableType.listType) { + final mergeAbleType = mergeAbleListType(l); + if (ListType.Object == mergeAbleType.listType) { var mergedList = mergeObjectList(l, '$path'); warnings.addAll(mergedList.warnings); clone[k] = List.filled(1, mergedList.result); @@ -112,7 +112,7 @@ WithWarning mergeObj(Map obj, Map other, String path) { if (l.isNotEmpty) { clone[k] = List.filled(1, l[0]); } - if (mergeableType.isAmbigous) { + if (mergeAbleType.isAmbiguous) { warnings.add(newAmbiguousType('$path/$k')); } } @@ -149,16 +149,16 @@ WithWarning mergeObjectList(List list, String path, if (idx != -1) { realIndex = idx - i; } - final ambiguosTypePath = '$path[$realIndex]/$k'; - warnings.add(newAmbiguousType(ambiguosTypePath)); + final ambiguousTypePath = '$path[$realIndex]/$k'; + warnings.add(newAmbiguousType(ambiguousTypePath)); } } else if (t == 'List') { var l = List.from(obj[k] as Iterable); final beginIndex = l.length; l.addAll(v as Iterable); // bug is here - final mergeableType = mergeableListType(l); - if (ListType.Object == mergeableType.listType) { + final mergeAbleType = mergeAbleListType(l); + if (ListType.Object == mergeAbleType.listType) { var mergedList = mergeObjectList(l, '$path[$i]/$k', beginIndex); warnings.addAll(mergedList.warnings); obj[k] = List.filled(1, mergedList.result); @@ -166,7 +166,7 @@ WithWarning mergeObjectList(List list, String path, if (l.isNotEmpty) { obj[k] = List.filled(1, l[0]); } - if (mergeableType.isAmbigous) { + if (mergeAbleType.isAmbiguous) { warnings.add(newAmbiguousType('$path[$i]/$k')); } } diff --git a/lib/common/utils/json_serialize/model_generator.dart b/lib/common/utils/json_serialize/model_generator.dart index 722117d2..794a775d 100644 --- a/lib/common/utils/json_serialize/model_generator.dart +++ b/lib/common/utils/json_serialize/model_generator.dart @@ -134,7 +134,7 @@ class ModelGenerator { final astNode = parse(rawJson, Settings()); var warnings = _generateClassDefinition(_rootClassName, jsonRawData, '', astNode); - // after generating all classes, replace the omited similar classes. + // after generating all classes, replace the omitted similar classes. for (var c in allClasses) { final fieldsKeys = c.fields.keys; for (var f in fieldsKeys) { diff --git a/lib/common/utils/pubspec/pubspec_utils.dart b/lib/common/utils/pubspec/pubspec_utils.dart index c624d4fc..c5dcb97f 100644 --- a/lib/common/utils/pubspec/pubspec_utils.dart +++ b/lib/common/utils/pubspec/pubspec_utils.dart @@ -10,7 +10,7 @@ import '../../../exception_handler/exceptions/cli_exception.dart'; import '../../../extensions.dart'; import '../logger/log_utils.dart'; import '../pub_dev/pub_dev_api.dart'; -import '../shell/shel.utils.dart'; +import '../shell/shell.utils.dart'; import 'yaml_to.string.dart'; // ignore: avoid_classes_with_only_static_members @@ -20,7 +20,7 @@ class PubspecUtils { static PubSpec get pubSpec => PubSpec.fromYamlString(_pubspecFile.readAsStringSync()); - /// separtor + /// separator static final _mapSep = _PubValue(() { var yaml = pubSpec.unParsedYaml!; if (yaml.containsKey('get_cli')) { @@ -84,7 +84,7 @@ class PubspecUtils { _savePub(pubSpec); if (runPubGet) await ShellUtils.pubGet(); - LogService.success(LocaleKeys.sucess_package_installed.trArgs([package])); + LogService.success(LocaleKeys.success_package_installed.trArgs([package])); return true; } @@ -103,7 +103,8 @@ class PubspecUtils { ); _savePub(newPub); if (logger) { - LogService.success(LocaleKeys.sucess_package_removed.trArgs([package])); + LogService.success( + LocaleKeys.success_package_removed.trArgs([package])); } } else if (logger) { LogService.info(LocaleKeys.info_package_not_installed.trArgs([package])); diff --git a/lib/common/utils/pubspec/yaml_to.string.dart b/lib/common/utils/pubspec/yaml_to.string.dart index 60eecb53..3914b8e8 100644 --- a/lib/common/utils/pubspec/yaml_to.string.dart +++ b/lib/common/utils/pubspec/yaml_to.string.dart @@ -1,4 +1,4 @@ -final _unsuportedCharacters = RegExp( +final _unSupportedCharacters = RegExp( r'''^[\n\t ,[\]{}#&*!|<>'"%@']|^[?-]$|^[?-][ \t]|[\n:][ \t]|[ \t]\n|[\n\t ]#|[\n\t :]$'''); class CliYamlToString { @@ -40,7 +40,7 @@ class CliYamlToString { String _escapeString(String line) { line = line.replaceAll('"', r'\"').replaceAll('\n', r'\n'); - if (line.contains(_unsuportedCharacters)) { + if (line.contains(_unSupportedCharacters)) { line = quotes + line + quotes; } @@ -68,14 +68,18 @@ class CliYamlToString { if (value is Iterable || value is Map) { _writeIndent(indentCount, stringSink); } - stringSink..write(key)..write(_divider); + stringSink + ..write(key) + ..write(_divider); _writeYamlString(value, indentCount, stringSink, false, false); } } else { for (var key in keys) { final value = node[key]; _writeIndent(indentCount, stringSink); - stringSink..write(key)..write(_divider); + stringSink + ..write(key) + ..write(_divider); _writeYamlString(value, indentCount, stringSink, false, false); if (value is Map || value is Iterable) { if (isTopLevel) { diff --git a/lib/common/utils/shell/shel.utils.dart b/lib/common/utils/shell/shell.utils.dart similarity index 97% rename from lib/common/utils/shell/shel.utils.dart rename to lib/common/utils/shell/shell.utils.dart index 1a60f762..60daf42f 100644 --- a/lib/common/utils/shell/shel.utils.dart +++ b/lib/common/utils/shell/shell.utils.dart @@ -72,7 +72,7 @@ class ShellUtils { await run('flutter pub global activate get_cli', verbose: true); } } - return LogService.success(LocaleKeys.sucess_update_cli.tr); + return LogService.success(LocaleKeys.success_update_cli.tr); } on Exception catch (err) { LogService.info(err.toString()); return LogService.error(LocaleKeys.error_update_cli.tr); diff --git a/lib/core/generator.dart b/lib/core/generator.dart index f4222921..f0155166 100644 --- a/lib/core/generator.dart +++ b/lib/core/generator.dart @@ -26,11 +26,11 @@ class GetCli { command.commandName == currentArgument || command.alias.contains(currentArgument), orElse: () => ErrorCommand('command not found')); - if (command.childrens.isNotEmpty) { + if (command.children.isNotEmpty) { if (command is CommandParent) { - command = _findCommand(++currentIndex, command.childrens); + command = _findCommand(++currentIndex, command.children); } else { - var childrenCommand = _findCommand(++currentIndex, command.childrens); + var childrenCommand = _findCommand(++currentIndex, command.children); if (!(childrenCommand is ErrorCommand)) { command = childrenCommand; } @@ -58,7 +58,7 @@ class ErrorCommand extends Command { } @override - String get hint => 'Print on erro'; + String get hint => 'Print on error'; @override String get codeSample => ''; @@ -70,9 +70,9 @@ class ErrorCommand extends Command { bool validate() => true; } -class NotFoundComannd extends Command { +class NotFoundCommand extends Command { @override - String get commandName => 'Not Found Comannd'; + String get commandName => 'Not Found Command'; @override Future execute() async { @@ -80,7 +80,7 @@ class NotFoundComannd extends Command { } @override - String get hint => 'Not Found Comannd'; + String get hint => 'Not Found Command'; @override String get codeSample => ''; diff --git a/lib/core/locales.g.dart b/lib/core/locales.g.dart index 7e180706..2c7af0e6 100644 --- a/lib/core/locales.g.dart +++ b/lib/core/locales.g.dart @@ -57,7 +57,7 @@ class LocaleKeys { static const hint_update = 'hint_update'; static const hint_version = 'hint_version'; static const info_unnecessary_flag = 'info_unnecessary_flag'; - static const info_unnecessary_flag_prural = 'info_unnecessary_flag_prural'; + static const info_unnecessary_flag_plural = 'info_unnecessary_flag_plural'; static const info_package_not_installed = 'info_package_not_installed'; static const info_cli_last_version_already_installed = 'info_cli_last_version_already_installed'; @@ -67,20 +67,21 @@ class LocaleKeys { static const options_yes = 'options_yes'; static const options_no = 'options_no'; static const optional_parameters = 'optional_parameters'; - static const sucess_page_create = 'sucess_page_create'; - static const sucess_locale_generate = 'sucess_locale_generate'; - static const sucess_getx_pattern_generated = 'sucess_getx_pattern_generated'; - static const sucess_clean_Pattern_generated = - 'sucess_clean_Pattern_generated'; - static const sucess_file_formatted = 'sucess_file_formatted'; - static const sucess_package_removed = 'sucess_package_removed'; - static const sucess_package_installed = 'sucess_package_installed'; - static const sucess_update_cli = 'sucess_update_cli'; - static const sucess_add_controller_in_bindings = - 'sucess_add_controller_in_bindings'; - static const sucess_navigation_added = 'sucess_navigation_added'; - static const sucess_file_created = 'sucess_file_created'; - static const sucess_route_created = 'sucess_route_created'; + static const success_page_create = 'success_page_create'; + static const success_locale_generate = 'success_locale_generate'; + static const success_getx_pattern_generated = + 'success_getx_pattern_generated'; + static const success_clean_Pattern_generated = + 'success_clean_Pattern_generated'; + static const success_file_formatted = 'success_file_formatted'; + static const success_package_removed = 'success_package_removed'; + static const success_package_installed = 'success_package_installed'; + static const success_update_cli = 'success_update_cli'; + static const success_add_controller_in_bindings = + 'success_add_controller_in_bindings'; + static const success_navigation_added = 'success_navigation_added'; + static const success_file_created = 'success_file_created'; + static const success_route_created = 'success_route_created'; static const ask_ios_lang = 'ask_ios_lang'; static const ask_android_lang = 'ask_android_lang'; static const ask_use_null_safe = 'ask_use_null_safe'; @@ -138,7 +139,7 @@ class Locales { 'hint_update': 'GET_CLI günceller', 'hint_version': 'Mevcut CLI sürümünü gösterir\'', 'info_unnecessary_flag': '%s gerekli değil', - 'info_unnecessary_flag_prural': '%s gerekli değil', + 'info_unnecessary_flag_plural': '%s gerekli değil', 'info_package_not_installed': 'Paket: %s bu uygulama için yüklenemedi', 'info_cli_last_version_already_installed': 'get_cli\'nin son sürümü zaten yüklü', @@ -148,22 +149,22 @@ class Locales { 'options_yes': 'Evet!', 'options_no': 'Hayır', 'optional_parameters': 'Opsiyonel parametreler: %s', - 'sucess_page_create': '%s sayfası başarıyla oluşturuldu.', - 'sucess_locale_generate': 'yerel dosyalar başarıyla oluşturuldu.', - 'sucess_getx_pattern_generated': + 'success_page_create': '%s sayfası başarıyla oluşturuldu.', + 'success_locale_generate': 'yerel dosyalar başarıyla oluşturuldu.', + 'success_getx_pattern_generated': 'GetX Pattern yapısı başarıyla oluşturuldu.', - 'sucess_clean_Pattern_generated': + 'success_clean_Pattern_generated': 'CLEAN Pattern yapısı başarıyla oluşturuldu.', - 'sucess_file_formatted': ' \'%s\' başarıyla biçimlendirildi.', - 'sucess_package_removed': 'Paket: %s kaldırıldı!', - 'sucess_package_installed': '\'Paket: %s yüklendi!', - 'sucess_update_cli': 'Yükseltme tamamlandı.', - 'sucess_add_controller_in_bindings': + 'success_file_formatted': ' \'%s\' başarıyla biçimlendirildi.', + 'success_package_removed': 'Paket: %s kaldırıldı!', + 'success_package_installed': '\'Paket: %s yüklendi!', + 'success_update_cli': 'Yükseltme tamamlandı.', + 'success_add_controller_in_bindings': '%s bağlayıcıya eklendi. Eklendiği dizin: %s\'', - 'sucess_navigation_added': '%s navigasyonu başarıyla eklendi.', - 'sucess_file_created': + 'success_navigation_added': '%s navigasyonu başarıyla eklendi.', + 'success_file_created': 'Dosya: %s başarıyla oluşturuldu. Oluşturulduğu dizin: %s', - 'sucess_route_created': '%s rotası başarıyla oluşturuldu.', + 'success_route_created': '%s rotası başarıyla oluşturuldu.', }; static const de = { 'ask_existing_page': @@ -228,7 +229,7 @@ class Locales { 'hint_update': 'So aktualisieren Sie GET_CLI', 'hint_version': 'Zeigt die aktuelle CLI-Version an\'', 'info_unnecessary_flag': 'Das %s ist nicht notwendig', - 'info_unnecessary_flag_prural': 'Die %s ist nicht notwendig', + 'info_unnecessary_flag_plural': 'Die %s ist nicht notwendig', 'info_package_not_installed': 'Paket: %s ist in dieser Anwendung nicht installiert', 'info_cli_last_version_already_installed': @@ -241,21 +242,21 @@ class Locales { 'options_no': 'Nein', 'options_rename': 'Ich möchte es umbenennen', 'optional_parameters': 'Optionale Parameter: %s', - 'sucess_page_create': '%s-Page erfolgreich erstellt.', - 'sucess_locale_generate': 'Sprachumgebungsdateien erfolgreich generiert.', - 'sucess_getx_pattern_generated': + 'success_page_create': '%s-Page erfolgreich erstellt.', + 'success_locale_generate': 'Sprachumgebungsdateien erfolgreich generiert.', + 'success_getx_pattern_generated': 'GetX Pattern-Struktur erfolgreich erzeugt.', - 'sucess_clean_Pattern_generated': + 'success_clean_Pattern_generated': 'CLEAN Pattern-Struktur erfolgreich erzeugt.', - 'sucess_file_formatted': ' \'%s\' wurde erfolgreich formatiert', - 'sucess_package_removed': 'Paket: %s entfernt!', - 'sucess_package_installed': '\'Paket: %s installiert!', - 'sucess_update_cli': 'Upgrade abgeschlossen', - 'sucess_add_controller_in_bindings': + 'success_file_formatted': ' \'%s\' wurde erfolgreich formatiert', + 'success_package_removed': 'Paket: %s entfernt!', + 'success_package_installed': '\'Paket: %s installiert!', + 'success_update_cli': 'Upgrade abgeschlossen', + 'success_add_controller_in_bindings': 'Das %s wurde dem Binding unter Pfad: %s\' hinzugefügt.', - 'sucess_navigation_added': '%s Navigation erfolgreich hinzugefügt.', - 'sucess_file_created': 'Datei: %s erfolgreich erstellt unter Pfad: %s', - 'sucess_route_created': '%s-Route erfolgreich erstellt.', + 'success_navigation_added': '%s Navigation erfolgreich hinzugefügt.', + 'success_file_created': 'Datei: %s erfolgreich erstellt unter Pfad: %s', + 'success_route_created': '%s-Route erfolgreich erstellt.', }; static const en = { 'ask_existing_page': @@ -314,7 +315,7 @@ class Locales { 'hint_update': 'To update GET_CLI', 'hint_version': 'Shows the current CLI version\'', 'info_unnecessary_flag': 'The %s is not necessary', - 'info_unnecessary_flag_prural': 'The %s are not necessary', + 'info_unnecessary_flag_plural': 'The %s are not necessary', 'info_package_not_installed': 'Package: %s is not installed in this application', 'info_cli_last_version_already_installed': @@ -327,21 +328,21 @@ class Locales { 'options_no': 'No', 'options_rename': 'I want to rename', 'optional_parameters': 'Optional parameters: %s', - 'sucess_page_create': '%s page created successfully.', - 'sucess_locale_generate': 'locale files generated successfully.', - 'sucess_getx_pattern_generated': + 'success_page_create': '%s page created successfully.', + 'success_locale_generate': 'locale files generated successfully.', + 'success_getx_pattern_generated': 'GetX Pattern structure successfully generated.', - 'sucess_clean_Pattern_generated': + 'success_clean_Pattern_generated': 'CLEAN Pattern structure successfully generated.', - 'sucess_file_formatted': ' \'%s\' was successfully formatted', - 'sucess_package_removed': 'Package: %s removed!', - 'sucess_package_installed': '\'Package: %s installed!', - 'sucess_update_cli': 'Upgrade complete', - 'sucess_add_controller_in_bindings': + 'success_file_formatted': ' \'%s\' was successfully formatted', + 'success_package_removed': 'Package: %s removed!', + 'success_package_installed': '\'Package: %s installed!', + 'success_update_cli': 'Upgrade complete', + 'success_add_controller_in_bindings': 'The %s has been added to binding at path: %s\'', - 'sucess_navigation_added': '%s navigation added successfully.', - 'sucess_file_created': 'File: %s created successfully at path: %s', - 'sucess_route_created': '%s route created successfully.', + 'success_navigation_added': '%s navigation added successfully.', + 'success_file_created': 'File: %s created successfully at path: %s', + 'success_route_created': '%s route created successfully.', }; static const pt_BR = { 'ask_existing_page': 'A página [%s] já existe, deseja sobrescrevê-la?', @@ -398,7 +399,7 @@ class Locales { 'hint_update': 'Para atualizar GET_CLI', 'hint_version': 'Mostra a versão atual do get_cli', 'info_unnecessary_flag': 'A flag: %s não é necessária', - 'info_unnecessary_flag_prural': 'As flags: %s não são necessárias', + 'info_unnecessary_flag_plural': 'As flags: %s não são necessárias', 'info_package_not_installed': 'Pacote: %s não está instalado neste aplicativo', 'info_cli_last_version_already_installed': @@ -411,19 +412,19 @@ class Locales { 'options_no': 'Não!', 'options_rename': 'Quero renomear!', 'optional_parameters': 'Parâmetros opcionais: %s', - 'sucess_page_create': 'Página %s criada com sucesso.', - 'sucess_locale_generate': 'Arquivo de tradução gerado com sucesso.', - 'sucess_getx_pattern_generated': - 'Estrutura GetX Pattern gerada com sucesso.', - 'sucess_clean_Pattern_generated': 'Estrutura CLEAN gerada com sucesso.', - 'sucess_file_formatted': ' \'%s\' foi formatado com sucesso', - 'sucess_package_removed': 'Pacote: %s removido!', - 'sucess_package_installed': 'Pacote: %s instalado!', - 'sucess_update_cli': 'Upgrade concluído', - 'sucess_add_controller_in_bindings': + 'success_page_create': 'Página %s criada com successo.', + 'success_locale_generate': 'Arquivo de tradução gerado com successo.', + 'success_getx_pattern_generated': + 'Estrutura GetX Pattern gerada com successo.', + 'success_clean_Pattern_generated': 'Estrutura CLEAN gerada com successo.', + 'success_file_formatted': ' \'%s\' foi formatado com successo', + 'success_package_removed': 'Pacote: %s removido!', + 'success_package_installed': 'Pacote: %s instalado!', + 'success_update_cli': 'Upgrade concluído', + 'success_add_controller_in_bindings': 'O %s foi adicionado ao binging no path: %s ', - 'sucess_navigation_added': '%s navigation adicionada com sucesso.', - 'sucess_file_created': 'Arquivo: %s criado com sucesso no path: %s', - 'sucess_route_created': 'Rota %s criada com sucesso.', + 'success_navigation_added': '%s navigation adicionada com successo.', + 'success_file_created': 'Arquivo: %s criado com successo no path: %s', + 'success_route_created': 'Rota %s criada com successo.', }; } diff --git a/lib/core/structure.dart b/lib/core/structure.dart index d8ccf9fc..34e890c6 100644 --- a/lib/core/structure.dart +++ b/lib/core/structure.dart @@ -48,7 +48,7 @@ class Structure { return '${element.path}${p.separator}'.contains('$on${p.separator}'); }, orElse: () { return list.firstWhere((element) { - //Fix erro ao encontrar arquivo com nome + //Fix error ao encontrar arquivo com nome if (element is File) { return false; } diff --git a/lib/functions/binding/add_dependencies.dart b/lib/functions/binding/add_dependencies.dart index b5657de5..f07dd13b 100644 --- a/lib/functions/binding/add_dependencies.dart +++ b/lib/functions/binding/add_dependencies.dart @@ -59,7 +59,7 @@ void addDependencyToBinding(String path, String controllerName, String import) { () => ${controllerName.pascalCase}Controller(), );'''); writeFile(file.path, lines.join('\n'), overwrite: true, logger: false); - LogService.success(LocaleKeys.sucess_add_controller_in_bindings + LogService.success(LocaleKeys.success_add_controller_in_bindings .trArgs([controllerName.pascalCase, path])); } } diff --git a/lib/functions/create/create_navigation.dart b/lib/functions/create/create_navigation.dart index fa6786fa..f88d2219 100644 --- a/lib/functions/create/create_navigation.dart +++ b/lib/functions/create/create_navigation.dart @@ -8,7 +8,7 @@ import '../../core/internationalization.dart'; import '../../core/locales.g.dart'; import '../../core/structure.dart'; import '../../samples/impl/arctekko/arc_navigation.dart'; -import '../formatter_dart_file/frommatter_dart_file.dart'; +import '../formatter_dart_file/formatter_dart_file.dart'; import 'create_single_file.dart'; void createNavigation() { @@ -50,5 +50,5 @@ void addNavigation(String name) { overwrite: true, logger: false); LogService.success(Translation( - LocaleKeys.sucess_navigation_added.trArgs([name.pascalCase]))); + LocaleKeys.success_navigation_added.trArgs([name.pascalCase]))); } diff --git a/lib/functions/create/create_single_file.dart b/lib/functions/create/create_single_file.dart index 7d81f597..6d1f8e8b 100644 --- a/lib/functions/create/create_single_file.dart +++ b/lib/functions/create/create_single_file.dart @@ -66,7 +66,7 @@ File writeFile(String path, String content, if (logger) { LogService.success( - LocaleKeys.sucess_file_created.trArgs( + LocaleKeys.success_file_created.trArgs( [basename(_file.path), _file.path], ), ); diff --git a/lib/functions/find_file/find_folder_by_directory.dart b/lib/functions/find_file/find_folder_by_directory.dart index acd16041..eef9ac09 100644 --- a/lib/functions/find_file/find_folder_by_directory.dart +++ b/lib/functions/find_file/find_folder_by_directory.dart @@ -6,7 +6,7 @@ Directory? findFolderByName(String name) { final List list = current.listSync(recursive: true, followLinks: false); var contains = list.firstWhere((element) { - //Fix erro ao encontrar arquivo com nome + //Fix error ao encontrar arquivo com nome if (element is Directory) { return element.path.contains(name); } diff --git a/lib/functions/formatter_dart_file/frommatter_dart_file.dart b/lib/functions/formatter_dart_file/formatter_dart_file.dart similarity index 100% rename from lib/functions/formatter_dart_file/frommatter_dart_file.dart rename to lib/functions/formatter_dart_file/formatter_dart_file.dart diff --git a/lib/functions/routes/arc_add_route.dart b/lib/functions/routes/arc_add_route.dart index 8b6d9610..02627382 100644 --- a/lib/functions/routes/arc_add_route.dart +++ b/lib/functions/routes/arc_add_route.dart @@ -10,7 +10,7 @@ import '../../core/structure.dart'; import '../../samples/impl/arctekko/arc_routes.dart'; import '../create/create_navigation.dart'; import '../create/create_single_file.dart'; -import '../formatter_dart_file/frommatter_dart_file.dart'; +import '../formatter_dart_file/formatter_dart_file.dart'; void arcAddRoute(String nameRoute) { var routesFile = File(Structure.replaceAsExpected( @@ -39,7 +39,7 @@ void arcAddRoute(String nameRoute) { writeFile(routesFile.path, lines.join('\n'), overwrite: true); LogService.success( - Translation(LocaleKeys.sucess_route_created).trArgs([nameRoute])); + Translation(LocaleKeys.success_route_created).trArgs([nameRoute])); addNavigation(nameRoute); } diff --git a/lib/functions/routes/get_add_route.dart b/lib/functions/routes/get_add_route.dart index 7523c36f..66ca77ec 100644 --- a/lib/functions/routes/get_add_route.dart +++ b/lib/functions/routes/get_add_route.dart @@ -10,7 +10,7 @@ import '../../core/locales.g.dart'; import '../../samples/impl/get_route.dart'; import '../create/create_single_file.dart'; import '../find_file/find_file_by_name.dart'; -import '../formatter_dart_file/frommatter_dart_file.dart'; +import '../formatter_dart_file/formatter_dart_file.dart'; import 'get_app_pages.dart'; import 'get_support_children.dart'; @@ -69,7 +69,7 @@ void addRoute(String nameRoute, String bindingDir, String viewDir) { lines.insert(indexEndRoutes, line); addAppPage(nameRoute, bindingDir, viewDir); LogService.success( - Translation(LocaleKeys.sucess_route_created).trArgs([nameRoute])); + Translation(LocaleKeys.success_route_created).trArgs([nameRoute])); } else { LogService.error('${LocaleKeys.warning.tr}, route not created by conflict'); } diff --git a/lib/functions/routes/get_app_pages.dart b/lib/functions/routes/get_app_pages.dart index 258a0855..8eb927e5 100644 --- a/lib/functions/routes/get_app_pages.dart +++ b/lib/functions/routes/get_app_pages.dart @@ -8,7 +8,7 @@ import '../../common/utils/pubspec/pubspec_utils.dart'; import '../../samples/impl/get_app_pages.dart'; import '../create/create_single_file.dart'; import '../find_file/find_file_by_name.dart'; -import '../formatter_dart_file/frommatter_dart_file.dart'; +import '../formatter_dart_file/formatter_dart_file.dart'; import 'get_support_children.dart'; void addAppPage(String name, String bindingDir, String viewDir) { @@ -61,7 +61,7 @@ void addAppPage(String name, String bindingDir, String viewDir) { '${_getTabs(_countTabs(lines[onPageStartIndex]))}),'), onPageStartIndex); } else { - _logInvalidFormart(); + _logInvalidFormat(); } if (onPageEndIndex != -1) { var indexChildrenStart = lines @@ -84,11 +84,11 @@ void addAppPage(String name, String bindingDir, String viewDir) { index = indexChildrenEnd; tabEspaces = _countTabs(lines[onPageStartIndex]) + 2; } else { - _logInvalidFormart(); + _logInvalidFormat(); } } } else { - _logInvalidFormart(); + _logInvalidFormat(); } } } @@ -125,7 +125,7 @@ int _countTabs(String line) { } /// log invalid format file -void _logInvalidFormart() { +void _logInvalidFormat() { LogService.info( 'the app_pages.dart file does not meet the ' 'expected format, fails to create children pages', diff --git a/lib/functions/sorter_imports/sort.dart b/lib/functions/sorter_imports/sort.dart index 8c7c8005..050571a7 100644 --- a/lib/functions/sorter_imports/sort.dart +++ b/lib/functions/sorter_imports/sort.dart @@ -3,7 +3,7 @@ import 'dart:convert'; import '../../common/utils/pubspec/pubspec_utils.dart'; import '../../extensions.dart'; import '../create/create_single_file.dart'; -import '../formatter_dart_file/frommatter_dart_file.dart'; +import '../formatter_dart_file/formatter_dart_file.dart'; import '../path/replace_to_relative.dart'; /// Sort imports from a dart file @@ -20,7 +20,7 @@ String sortImports( var contentLines = []; - var librarys = []; + var libraries = []; var dartImports = []; var flutterImports = []; var packageImports = []; @@ -53,7 +53,7 @@ String sortImports( } else if (lines[i].startsWith('library ') && lines[i].endsWith(';') && !stringLine) { - librarys.add(lines[i]); + libraries.add(lines[i]); } else { var containsThreeQuotes = lines[i].contains("'''"); if (containsThreeQuotes) { @@ -90,12 +90,12 @@ String sortImports( projectImports.sort(); projectRelativeImports.sort(); exports.sort(); - librarys.sort(); + libraries.sort(); var sortedLines = []; sortedLines.addAll([ - ...librarys, + ...libraries, '', ...dartImports, '', diff --git a/lib/get_cli.dart b/lib/get_cli.dart index 99009261..124bab9c 100644 --- a/lib/get_cli.dart +++ b/lib/get_cli.dart @@ -1,3 +1,3 @@ -export 'package:get_cli/commands/impl/commads_export.dart'; +export 'package:get_cli/commands/impl/commands_export.dart'; export 'package:get_cli/core/generator.dart'; export 'package:get_cli/extensions.dart'; diff --git a/lib/samples/interface/sample_interface.dart b/lib/samples/interface/sample_interface.dart index 28344d1a..b97943b3 100644 --- a/lib/samples/interface/sample_interface.dart +++ b/lib/samples/interface/sample_interface.dart @@ -11,7 +11,7 @@ abstract class Sample { String path; /// If the file is found in the path, it can be ignored or - /// overwritten. If overrite = false, the source file will not be changed. + /// overwritten. If overwrite = false, the source file will not be changed. /// The default is [false]. bool overwrite; diff --git a/translations/de.json b/translations/de.json index 01202fe1..e6b07a98 100644 --- a/translations/de.json +++ b/translations/de.json @@ -58,7 +58,7 @@ }, "info": { "unnecessary_flag": "Das %s ist nicht notwendig", - "unnecessary_flag_prural": "Die %s ist nicht notwendig", + "unnecessary_flag_plural": "Die %s ist nicht notwendig", "package_not_installed": "Paket: %s ist in dieser Anwendung nicht installiert", "cli_last_version_already_installed": "Neueste Version von get_cli bereits installiert", "no_file_overwritten": "Es wurden keine Dateien überschrieben", diff --git a/translations/en.json b/translations/en.json index 5ad83168..33f00db5 100644 --- a/translations/en.json +++ b/translations/en.json @@ -58,7 +58,7 @@ }, "info": { "unnecessary_flag": "The %s is not necessary", - "unnecessary_flag_prural": "The %s are not necessary", + "unnecessary_flag_plural": "The %s are not necessary", "package_not_installed": "Package: %s is not installed in this application", "cli_last_version_already_installed": "Latest version of get_cli already installed", "no_file_overwritten": "No files were overwritten", diff --git a/translations/pt_BR.json b/translations/pt_BR.json index 0c8a7a68..c3b91dd1 100644 --- a/translations/pt_BR.json +++ b/translations/pt_BR.json @@ -51,7 +51,7 @@ }, "info": { "unnecessary_flag": "A flag: %s não é necessária", - "unnecessary_flag_prural": "As flags: %s não são necessárias", + "unnecessary_flag_plural": "As flags: %s não são necessárias", "package_not_installed": "Pacote: %s não está instalado neste aplicativo", "cli_last_version_already_installed": "Versão mais recente de get_cli já instalada", "no_file_overwritten": "Nenhum arquivo foi sobrescrito", @@ -62,7 +62,6 @@ "yes": "Sim!", "no": "Não!", "rename": "Quero renomear!" - }, "optional_parameters": "Parâmetros opcionais: %s", "sucess": { diff --git a/translations/tr_TR.json b/translations/tr_TR.json index 7961c9f0..1cf3cfc8 100644 --- a/translations/tr_TR.json +++ b/translations/tr_TR.json @@ -51,7 +51,7 @@ }, "info": { "unnecessary_flag": "%s gerekli değil", - "unnecessary_flag_prural": "%s gerekli değil", + "unnecessary_flag_plural": "%s gerekli değil", "package_not_installed": "Paket: %s bu uygulama için yüklenemedi", "cli_last_version_already_installed": "get_cli'nin son sürümü zaten yüklü", "no_file_overwritten": "Hiçbir dosyanın üzerine yazılmadı", diff --git a/translations/zh_CN.json b/translations/zh_CN.json index 0354d3c2..e82155f6 100644 --- a/translations/zh_CN.json +++ b/translations/zh_CN.json @@ -58,7 +58,7 @@ }, "info": { "unnecessary_flag": "%s 是多余的", - "unnecessary_flag_prural": "%s 是多余的", + "unnecessary_flag_plural": "%s 是多余的", "package_not_installed": "Package: %s 在本应用中未安装", "cli_last_version_already_installed": "您已安装 get_cli 最新版本", "no_file_overwritten": "没有文件被覆盖",