diff --git a/lib/pangea/enum/analytics/morph_categories_enum.dart b/lib/pangea/enum/analytics/morph_categories_enum.dart index 6b52055d8..677f58fa3 100644 --- a/lib/pangea/enum/analytics/morph_categories_enum.dart +++ b/lib/pangea/enum/analytics/morph_categories_enum.dart @@ -39,13 +39,15 @@ enum MorphologicalCategories { extension MorphologicalCategoriesExtension on MorphologicalCategories { /// Convert enum to string String toShortString() { - return toString().split('.').last; + return toString().split('.').last.toLowerCase(); } /// Convert string to enum static MorphologicalCategories? fromString(String category) { return MorphologicalCategories.values.firstWhereOrNull( - (e) => e.toShortString() == category, + (e) => + e.toShortString() == + category.toLowerCase().replaceAll(RegExp(r'[,\[\]]'), ''), ); } diff --git a/lib/pangea/utils/get_grammar_copy.dart b/lib/pangea/utils/get_grammar_copy.dart index cdcdcb3d6..86c36be30 100644 --- a/lib/pangea/utils/get_grammar_copy.dart +++ b/lib/pangea/utils/get_grammar_copy.dart @@ -20,7 +20,7 @@ String? getGrammarCopy({ } final String key = - 'grammarCopy${category.toUpperCase()}${lemma.replaceAll(",", "").toLowerCase()}'; + 'grammarCopy${category.replaceAll(RegExp(r'[,\[\]]'), '').toUpperCase()}${lemma.replaceAll(RegExp(r'[,\[\]]'), '').toLowerCase()}'; switch (key) { case 'grammarCopyPOSsconj': @@ -81,6 +81,12 @@ String? getGrammarCopy({ return L10n.of(context)!.grammarCopyPUNCTTYPEbrck; case 'grammarCopyNOUNTYPEart': return L10n.of(context)!.grammarCopyNOUNTYPEart; + case 'grammarCopyNUMBERPSORsing': + return L10n.of(context)!.grammarCopyNUMBERPSORsing; + case 'grammarCopyNUMBERPSORplur': + return L10n.of(context)!.grammarCopyNUMBERPSORplur; + case 'grammarCopyNUMBERPSORdual': + return L10n.of(context)!.grammarCopyNUMBERPSORdual; case 'grammarCopyNUMBERsing': return L10n.of(context)!.grammarCopyNUMBERsing; case 'grammarCopyGENDERmasc':