Merge branch 'master' into upgrade-dependencies

# Conflicts:
#	flutter_sheet_localization_generator/pubspec.yaml

Author: elias8

README.md

@@ -8,11 +8,12 @@ Add the following to your `pubspec.yaml`:
 
 ```sh
 dependencies:
-  flutter_sheet_localization: ^2.0.0
+  flutter_sheet_localization: <latest>
+  intl: <latest>
 
 dev_dependencies:
-  flutter_sheet_localization_generator: ^2.0.0
-  build_runner: ^1.3.1
+  flutter_sheet_localization_generator: <latest>
+  build_runner: ^1.10.2
 ```
 
 ### Usage
@@ -115,6 +116,16 @@ The file should have :
   * Column 0 : the label key (can be a hierarchy, separated by dots)
   * then each translation based on language code of the column
 
+### Ignoring a column
+
+Sometimes you may need to add comments for translators. For this, simply add a column with a name between parenthesis and the column will be completely ignored by the generator.
+
+Example :
+
+> | Key | (Comments) | fr | en |
+> | --- | --- | --- | --- |
+> | example.man(Gender.male) | This is a man title on home page | homme | man |
+> | example.man(Gender.female) | This is a woman title on home page | femme | woman |
 
 ### Conditionals
 
@@ -144,13 +155,15 @@ Example :
 > | example.man(Plural.one) | homme | man |
 > | example.man(Plural.multiple) | hommes | men |
 
-From your Dart code, you can then define a function :
+From your Dart code, you can then define an extension :
 
 ```dart
-Plural plural(int count) {
-  if (count == 0) return Plural.zero;
-  if (count == 1) return Plural.one;
-  return Plural.multiple;
+extension PluralExtension on int {
+  Plural plural() {
+    if (this == 0) return Plural.zero;
+    if (this == 1) return Plural.one;
+    return Plural.multiple;
+  }
 }
 ```
 

flutter_sheet_localization/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.0.1
+
+- Removed pedantic dependency.
+
 ## 2.0.0
 
 - Added version to force regeneration.

flutter_sheet_localization/analysis_options.yaml

@@ -1,4 +1,4 @@
 import 'package:flutter_sheet_localization/flutter_sheet_localization.dart';
 
-@SheetLocalization("", "", 1)
+@SheetLocalization('', '', 1)
 class AppLabels {}

flutter_sheet_localization/example/flutter_sheet_localization_example.dart

@@ -1,10 +1,7 @@
 name: flutter_sheet_localization
 description: Annotations for the flutter_sheet_localization_generator package.
-version: 2.0.0
+version: 2.0.1
 homepage: https://github.com/aloisdeniel/flutter_sheet_localization
 
 environment:
-  sdk: '>=2.5.0 <3.0.0'
-
-dev_dependencies:
-  pedantic: ^1.8.0
+  sdk: '>=2.7.0 <3.0.0'

flutter_sheet_localization/pubspec.yaml

@@ -1,3 +1,17 @@
+## 2.1.2
+
+- Upgraded dependencies.
+
+## 2.1.1
+
+- Ignoring `camel_case_types` linter rule.
+- Updated typedef format.
+
+## 2.1.0
+
+- Added ignored columns when named `(<name>)`.
+- Strings are now generated with `'` instead of `"`. 
+
 ## 2.0.2
 
 - Upgraded recase dependency.

flutter_sheet_localization_generator/.DS_Store

@@ -8,11 +8,12 @@ Add the following to your `pubspec.yaml`:
 
 ```sh
 dependencies:
-  flutter_sheet_localization: ^1.0.0
+  flutter_sheet_localization: <latest>
+  intl: <latest>
 
 dev_dependencies:
-  flutter_sheet_localization_generator: ^1.0.0
-  build_runner: ^1.3.1
+  flutter_sheet_localization_generator: <latest>
+  build_runner: ^1.10.2
 ```
 
 ### Usage
@@ -115,6 +116,16 @@ The file should have :
   * Column 0 : the label key (can be a hierarchy, separated by dots)
   * then each translation based on language code of the column
 
+### Ignoring a column
+
+Sometimes you may need to add comments for translators. For this, simply add a column with a name between parenthesis and the column will be completely ignored by the generator.
+
+Example :
+
+> | Key | (Comments) | fr | en |
+> | --- | --- | --- | --- |
+> | example.man(Gender.male) | This is a man title on home page | homme | man |
+> | example.man(Gender.female) | This is a woman title on home page | femme | woman |
 
 ### Conditionals
 
@@ -144,13 +155,15 @@ Example :
 > | example.man(Plural.one) | homme | man |
 > | example.man(Plural.multiple) | hommes | men |
 
-From your Dart code, you can then define a function :
+From your Dart code, you can then define an extension :
 
 ```dart
-Plural plural(int count) {
-  if (count == 0) return Plural.zero;
-  if (count == 1) return Plural.one;
-  return Plural.multiple;
+extension PluralExtension on int {
+  Plural plural() {
+    if (this == 0) return Plural.zero;
+    if (this == 1) return Plural.one;
+    return Plural.multiple;
+  }
 }
 ```
 

flutter_sheet_localization_generator/CHANGELOG.md

@@ -5,10 +5,12 @@ import 'package:intl/intl.dart';
 
 part 'localizations.g.dart';
 
-Plural plural(int count) {
-  if (count == 0) return Plural.zero;
-  if (count == 1) return Plural.one;
-  return Plural.multiple;
+extension PluralExtension on int {
+  Plural plural() {
+    if (this == 0) return Plural.zero;
+    if (this == 1) return Plural.one;
+    return Plural.multiple;
+  }
 }
 
 @SheetLocalization('1AcjI1BjmQpjlnPUZ7aVLbrnVR98xtATnSjU4CExM9fs', '0', 15)