aiden
/
fluffychat
mirror of https://github.com/krille-chan/fluffychat
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

removed redundant category from label copy

Browse Source
pull/1490/head
William Jordan-Cooley 1 year ago
parent b37074459e
commit 6e3795fe48
3 changed files with 152 additions and 153 deletions
Show Stats Download Patch File Download Diff File

182
assets/l10n/intl_en.arb
Unescape Escape View File

@ -4247,7 +4247,7 @@
"grammarCopyPUNCTTYPEqest": "Question", "grammarCopyPUNCTTYPEqest": "Question",
"grammarCopyASPECTperf": "Perfect", "grammarCopyASPECTperf": "Perfect",
"grammarCopyCASEaccnom": "Accusative, Nominative", "grammarCopyCASEaccnom": "Accusative, Nominative",
"grammarCopyCASEobl": "Oblique Case", "grammarCopyCASEobl": "Oblique",
"grammarCopyVOICEact": "Active", "grammarCopyVOICEact": "Active",
"grammarCopyPUNCTTYPEbrck": "Bracket", "grammarCopyPUNCTTYPEbrck": "Bracket",
"grammarCopyNOUNTYPEart": "Article", "grammarCopyNOUNTYPEart": "Article",
@ -4290,7 +4290,7 @@
"grammarCopyPRONTYPErel": "Relative", "grammarCopyPRONTYPErel": "Relative",
"grammarCopyVERBFORMfinalEnding": "Final Ending", "grammarCopyVERBFORMfinalEnding": "Final Ending",
"grammarCopyPRONTYPEdem": "Demonstrative", "grammarCopyPRONTYPEdem": "Demonstrative",
"grammarCopyPREPCASEpre": "Preposition", "grammarCopyPREPCASEpre": "Prepositional",
"grammarCopyVERBFORMfin": "Finite", "grammarCopyVERBFORMfin": "Finite",
"grammarCopyDEGREEpos": "Positive", "grammarCopyDEGREEpos": "Positive",
"grammarCopyPUNCTTYPEquot": "Quotation", "grammarCopyPUNCTTYPEquot": "Quotation",
@ -4306,36 +4306,36 @@
"grammarCopyCASEloc": "Locative", "grammarCopyCASEloc": "Locative",
"grammarCopyMOODind": "Indicative", "grammarCopyMOODind": "Indicative",
"grammarCopyDEGREEcmp": "Comparative", "grammarCopyDEGREEcmp": "Comparative",
"grammarCopyCASErelativeCase": "Relative Case", "grammarCopyCASErelativeCase": "Relative",
"grammarCopyPUNCTTYPEexcl": "Exclamative", "grammarCopyPUNCTTYPEexcl": "Exclamative",
"grammarCopyPERSON1": "First Person", "grammarCopyPERSON1": "First Person",
"grammarCopyPUNCTSIDEini": "Initial", "grammarCopyPUNCTSIDEini": "Initial",
"grammarCopyGENDERperson": "Person", "grammarCopyGENDERperson": "Person",
"grammarCopyFOREIGNyes": "Foreign", "grammarCopyFOREIGNyes": "Foreign",
"grammarCopyVOICEvoice": "Voice", "grammarCopyVOICEvoice": "Voice",
"grammarCopyVERBTYPEverbType": "Verb Type", "grammarCopyVERBTYPEverbType": "Verb",
"grammarCopyPOSSpass": "Possessive", "grammarCopyPOSSpass": "Possessive",
"grammarCopyPREPCASEprepCase": "Prepositional Case", "grammarCopyPREPCASEprepCase": "Prepositional",
"grammarCopyNUMTYPEnumType": "Numeral Type", "grammarCopyNUMTYPEnumType": "Numeral",
"grammarCopyNOUNTYPEnounType": "Noun Type", "grammarCopyNOUNTYPEnounType": "Noun",
"grammarCopyREFLEXreflex": "Reflexive", "grammarCopyREFLEXreflex": "Reflexive",
"grammarCopyPRONTYPEpronType": "Pronoun Type", "grammarCopyPRONTYPEpronType": "Pronoun",
"grammarCopyPUNCTSIDEpunctSide": "Punctuation Side", "grammarCopyPUNCTSIDEpunctSide": "Punctuation Side",
"grammarCopyVERBFORMverbForm": "Verb Form", "grammarCopyVERBFORMverbForm": "Verb",
"grammarCopyGENDERgender": "Gender", "grammarCopyGENDERgender": "Gender",
"grammarCopyMOODmood": "Mood", "grammarCopyMOODmood": "Mood",
"grammarCopyASPECTaspect": "Aspect", "grammarCopyASPECTaspect": "Aspect",
"grammarCopyPUNCTTYPEpunctType": "Punctuation Type", "grammarCopyPUNCTTYPEpunctType": "Punctuation",
"grammarCopyTENSEtense": "Tense", "grammarCopyTENSEtense": "Tense",
"grammarCopyDEGREEdegree": "Degree", "grammarCopyDEGREEdegree": "Degree",
"grammarCopyPOLITEpolite": "Politeness", "grammarCopyPOLITEpolite": "Politeness",
"grammarCopyADVTYPEadvType": "Adverb Type", "grammarCopyADVTYPEadvType": "Adverb",
"grammarCopyNUMFORMnumber": "Number", "grammarCopyNUMFORMnumber": "Number",
"grammarCopyCONJTYPEconjType": "Conjunction Type", "grammarCopyCONJTYPEconjType": "Conjunction",
"grammarCopyPOLARITYpolarity": "Polarity", "grammarCopyPOLARITYpolarity": "Polarity",
"grammarCopyCASEcase": "Case", "grammarCopyCASEcase": "Case",
"grammarCopyDEFINITEdefinite": "Definiteness", "grammarCopyDEFINITEdefinite": "Definiteness",
"grammarCopyNUMFORMnumForm": "Numeral Form", "grammarCopyNUMFORMnumForm": "Numeral",
"grammarCopyPRONTYPEadn": "Adnominal", "grammarCopyPRONTYPEadn": "Adnominal",
"grammarCopyVOCvoc": "Vocative", "grammarCopyVOCvoc": "Vocative",
"grammarCopyCMPLcmpl": "Complementizer", "grammarCopyCMPLcmpl": "Complementizer",
@ -4346,74 +4346,74 @@
"grammarCopyPARTTYPEpar": "Partitive", "grammarCopyPARTTYPEpar": "Partitive",
"grammarCopySPCspc": "Specific", "grammarCopySPCspc": "Specific",
"grammarCopyTENSEpqp": "Pluperfect", "grammarCopyTENSEpqp": "Pluperfect",
"grammarCopyREFLEXref": "Reflexive Case", "grammarCopyREFLEXref": "Reflexive",
"grammarCopyPUNCTTYPEnshrt": "Short", "grammarCopyPUNCTTYPEnshrt": "Short",
"grammarCopyNUMBERdual": "Dual", "grammarCopyNUMBERdual": "Dual",
"grammarCopyNUMFORMlng": "Long", "grammarCopyNUMFORMlng": "Long",
"grammarCopyVOICEmid": "Middle Voice", "grammarCopyVOICEmid": "Middle",
"grammarCopyINTRELintRel": "Interrogative, Relative", "grammarCopyINTRELintRel": "Interrogative, Relative",
"grammarCopyINTint": "Interrogative", "grammarCopyINTint": "Interrogative",
"grammarCopyVOICEcaus": "Causative Voice", "grammarCopyVOICEcaus": "Causative",
"grammarCopyUnknown": "Unknown", "grammarCopyUnknown": "Unknown",
"grammarCopyEVIDENTevident": "Evidentiality", "grammarCopyEVIDENTevident": "Evidentiality",
"grammarCopyNUMFORMnumberPsor": "Possessor's Number", "grammarCopyNUMFORMnumberPsor": "Possessor's Number",
"grammarCopyASPECThab": "Habitual", "grammarCopyASPECThab": "Habitual",
"grammarCopyCASEabl": "Ablative Case", "grammarCopyCASEabl": "Ablative",
"grammarCopyCASEall": "Allative Case", "grammarCopyCASEall": "Allative",
"grammarCopyCASEess": "Essive Case", "grammarCopyCASEess": "Essive",
"grammarCopyCASEtra": "Translative Case", "grammarCopyCASEtra": "Translative",
"grammarCopyCASEequ": "Equative Case", "grammarCopyCASEequ": "Equative",
"grammarCopyCASEdis": "Distributive Case", "grammarCopyCASEdis": "Distributive",
"grammarCopyCASEabs": "Absolutive Case", "grammarCopyCASEabs": "Absolutive",
"grammarCopyCASEerg": "Ergative Case", "grammarCopyCASEerg": "Ergative",
"grammarCopyCASEcau": "Causal Case", "grammarCopyCASEcau": "Causal",
"grammarCopyCASEben": "Benefactive Case", "grammarCopyCASEben": "Benefactive",
"grammarCopyCASEtem": "Temporal Case", "grammarCopyCASEtem": "Temporal",
"grammarCopyCONJTYPEcoord": "Coordinating Conjunction", "grammarCopyCONJTYPEcoord": "Coordinating",
"grammarCopyDEFINITEcons": "Construct State", "grammarCopyDEFINITEcons": "Construct State",
"grammarCopyDEGREEabs": "Absolute Degree", "grammarCopyDEGREEabs": "Absolute Degree",
"grammarCopyEVIDENTfh": "Factual Evidentiality", "grammarCopyEVIDENTfh": "Factual Evidentiality",
"grammarCopyEVIDENTnfh": "Non-factual Evidentiality", "grammarCopyEVIDENTnfh": "Non-factual Evidentiality",
"grammarCopyMOODopt": "Optative Mood", "grammarCopyMOODopt": "Optative",
"grammarCopyMOODadm": "Admirative Mood", "grammarCopyMOODadm": "Admirative",
"grammarCopyMOODdes": "Desiderative Mood", "grammarCopyMOODdes": "Desiderative",
"grammarCopyMOODnec": "Necessitative Mood", "grammarCopyMOODnec": "Necessitative",
"grammarCopyMOODpot": "Potential Mood", "grammarCopyMOODpot": "Potential",
"grammarCopyMOODprp": "Propositive Mood", "grammarCopyMOODprp": "Propositive",
"grammarCopyMOODqot": "Quotative Mood", "grammarCopyMOODqot": "Quotative",
"grammarCopyNUMFORMword": "Word Form", "grammarCopyNUMFORMword": "Word Form",
"grammarCopyNUMFORMroman": "Roman Numeral", "grammarCopyNUMFORMroman": "Roman Numeral",
"grammarCopyNUMFORMletter": "Letter Form", "grammarCopyNUMFORMletter": "Letter Form",
"grammarCopyNUMTYPEmult": "Multiplicative Numeral", "grammarCopyNUMTYPEmult": "Multiplicative",
"grammarCopyNUMTYPEfrac": "Fractional Numeral", "grammarCopyNUMTYPEfrac": "Fractional",
"grammarCopyNUMTYPEsets": "Set Numeral", "grammarCopyNUMTYPEsets": "Set",
"grammarCopyNUMTYPErange": "Range Numeral", "grammarCopyNUMTYPErange": "Range",
"grammarCopyNUMTYPEdist": "Distributive Numeral", "grammarCopyNUMTYPEdist": "Distributive",
"grammarCopyNUMBERtri": "Trial Number", "grammarCopyNUMBERtri": "Trial",
"grammarCopyNUMBERpauc": "Paucal Number", "grammarCopyNUMBERpauc": "Paucal",
"grammarCopyNUMBERgrpa": "Greater Paucal Number", "grammarCopyNUMBERgrpa": "Greater Paucal",
"grammarCopyNUMBERgrpl": "Greater Plural Number", "grammarCopyNUMBERgrpl": "Greater Plural",
"grammarCopyNUMBERinv": "Inverse Number", "grammarCopyNUMBERinv": "Inverse",
"grammarCopyPERSON0": "Zero Person", "grammarCopyPERSON0": "Zero",
"grammarCopyPERSON4": "Fourth Person", "grammarCopyPERSON4": "Fourth",
"grammarCopyPOLITEform": "Formal Politeness", "grammarCopyPOLITEform": "Formal",
"grammarCopyPOLITEelev": "Elevated Politeness", "grammarCopyPOLITEelev": "Elevated",
"grammarCopyPOLITEhumb": "Humble Politeness", "grammarCopyPOLITEhumb": "Humble",
"grammarCopyPRONTYPEemp": "Emphatic Pronoun", "grammarCopyPRONTYPEemp": "Emphatic",
"grammarCopyPRONTYPEexc": "Exclamative Pronoun", "grammarCopyPRONTYPEexc": "Exclamative",
"grammarCopyPRONTYPErcp": "Reciprocal Pronoun", "grammarCopyPRONTYPErcp": "Reciprocal",
"grammarCopyPRONTYPEintRelPronType": "Interrogative-Relative Pronoun", "grammarCopyPRONTYPEintRelPronType": "Interrogative-Relative",
"grammarCopyTENSEaor": "Aorist Tense", "grammarCopyTENSEaor": "Aorist",
"grammarCopyTENSEeps": "Epistemic Tense", "grammarCopyTENSEeps": "Epistemic",
"grammarCopyTENSEprosp": "Prospective Tense", "grammarCopyTENSEprosp": "Prospective",
"grammarCopyVERBFORMpart": "Participle Form", "grammarCopyVERBFORMpart": "Participle",
"grammarCopyVERBFORMconv": "Converb Form", "grammarCopyVERBFORMconv": "Converb",
"grammarCopyVERBFORMvnoun": "Verbal Noun", "grammarCopyVERBFORMvnoun": "Verbal Noun",
"grammarCopyVOICEantip": "Antipassive Voice", "grammarCopyVOICEantip": "Antipassive",
"grammarCopyVOICEcauVoice": "Causative Voice", "grammarCopyVOICEcauVoice": "Causative",
"grammarCopyVOICedir": "Direct Voice", "grammarCopyVOICedir": "Direct",
"grammarCopyVOICEinvVoice": "Inverse Voice", "grammarCopyVOICEinvVoice": "Inverse",
"grammarCopyVOICErcpVoice": "Reciprocal Voice", "grammarCopyVOICErcpVoice": "Reciprocal",
"grammarCopyPOS": "Part of Speech", "grammarCopyPOS": "Part of Speech",
"grammarCopyGENDER": "Gender", "grammarCopyGENDER": "Gender",
"grammarCopyPERSON": "Person", "grammarCopyPERSON": "Person",
@ -4449,18 +4449,18 @@
"grammarCopyNUMBERPSOR": "Possessor's Number", "grammarCopyNUMBERPSOR": "Possessor's Number",
"grammarCopyPOSS": "Possessive", "grammarCopyPOSS": "Possessive",
"grammarCopyASPECTimp": "Imperfective Aspect", "grammarCopyASPECTimp": "Imperfective Aspect",
"grammarCopyCASEvoc": "Vocative Case", "grammarCopyCASEvoc": "Vocative",
"grammarCopyCASEcom": "Comitative Case", "grammarCopyCASEcom": "Comitative",
"grammarCopyCASEpar": "Partitive Case", "grammarCopyCASEpar": "Partitive",
"grammarCopyCASEadv": "Adverbial Case", "grammarCopyCASEadv": "Adverbial",
"grammarCopyCASEref": "Referential Case", "grammarCopyCASEref": "Referential",
"grammarCopyCASErel": "Relative Case", "grammarCopyCASErel": "Relative",
"grammarCopyCASEsub": "Subessive Case", "grammarCopyCASEsub": "Subessive",
"grammarCopyCASEsup": "Superessive Case", "grammarCopyCASEsup": "Superessive",
"grammarCopyCASEaccdat": "Accusative-Dative Case", "grammarCopyCASEaccdat": "Accusative-Dative",
"grammarCopyCASEpre": "Prepositional Case", "grammarCopyCASEpre": "Prepositional",
"grammarCopyCONJTYPEsub": "Subordinating Conjunction", "grammarCopyCONJTYPEsub": "Subordinating",
"grammarCopyCONJTYPEcmp": "Comparative Conjunction", "grammarCopyCONJTYPEcmp": "Comparative",
"grammarCopyDEFINITEind": "Indefinite", "grammarCopyDEFINITEind": "Indefinite",
"grammarCopyMOODint": "Interrogative Mood", "grammarCopyMOODint": "Interrogative Mood",
"grammarCopyNOUNTYPEcomm": "Common Noun", "grammarCopyNOUNTYPEcomm": "Common Noun",
@ -4470,25 +4470,25 @@
"grammarCopyPOLARITYpos": "Positive Polarity", "grammarCopyPOLARITYpos": "Positive Polarity",
"grammarCopyPOSSyes": "Possessive", "grammarCopyPOSSyes": "Possessive",
"grammarCopyPREPCASEnpr": "Non-prepositional", "grammarCopyPREPCASEnpr": "Non-prepositional",
"grammarCopyPRONTYPEprs": "Personal Pronoun", "grammarCopyPRONTYPEprs": "Personal",
"grammarCopyPRONTYPEint": "Interrogative Pronoun", "grammarCopyPRONTYPEint": "Interrogative",
"grammarCopyPRONTYPEtot": "Total Pronoun", "grammarCopyPRONTYPEtot": "Total",
"grammarCopyPRONTYPEneg": "Negative Pronoun", "grammarCopyPRONTYPEneg": "Negative",
"grammarCopyPRONTYPEart": "Article Pronoun", "grammarCopyPRONTYPEart": "Article",
"grammarCopyPRONTYPEind": "Indefinite Pronoun", "grammarCopyPRONTYPEind": "Indefinite",
"grammarCopyPRONTYPEintrel": "Interrogative-Relative Pronoun", "grammarCopyPRONTYPEintrel": "Interrogative-Relative",
"grammarCopyPUNCTSIDEfin": "Final Punctuation", "grammarCopyPUNCTSIDEfin": "Final Punctuation",
"grammarCopyPUNCTTYPEperi": "Period", "grammarCopyPUNCTTYPEperi": "Period",
"grammarCopyREFLEXyes": "Reflexive", "grammarCopyREFLEXyes": "Reflexive",
"grammarCopyTENSEimp": "Imperfect Tense", "grammarCopyTENSEimp": "Imperfect",
"grammarCopyVERBFORMsup": "Supine Form", "grammarCopyVERBFORMsup": "Supine",
"grammarCopyVERBFORMadn": "Adnominal Form", "grammarCopyVERBFORMadn": "Adnominal",
"grammarCopyVERBFORMlng": "Long Form", "grammarCopyVERBFORMlng": "Long",
"grammarCopyVERBTYPEcaus": "Causative Verb", "grammarCopyVERBTYPEcaus": "Causative Verb",
"grammarCopyVOICEcau": "Causative Voice", "grammarCopyVOICEcau": "Causative",
"grammarCopyVOICEdir": "Direct Voice", "grammarCopyVOICEdir": "Direct",
"grammarCopyVOICEinv": "Inverse Voice", "grammarCopyVOICEinv": "Inverse",
"grammarCopyVOICErcp": "Reciprocal Voice", "grammarCopyVOICErcp": "Reciprocal",
"enterPrompt": "Please enter a system prompt", "enterPrompt": "Please enter a system prompt",
"selectBotLanguage": "Select bot language", "selectBotLanguage": "Select bot language",
"chooseVoice": "Choose a voice", "chooseVoice": "Choose a voice",

2
lib/main.dart
Unescape Escape View File

@ -23,7 +23,7 @@ void main() async {
// #Pangea // #Pangea
try { try {
await dotenv.load(fileName: ".env"); await dotenv.load(fileName: ".env.local_choreo");
} catch (e) { } catch (e) {
Logs().e('Failed to load .env file', e); Logs().e('Failed to load .env file', e);
} }

121
lib/pangea/widgets/practice_activity/practice_activity_card.dart
Unescape Escape View File

@ -103,79 +103,78 @@ class PracticeActivityCardState extends State<PracticeActivityCard> {
Future<PracticeActivityModel?> _fetchNewActivity([ Future<PracticeActivityModel?> _fetchNewActivity([
ActivityQualityFeedback? activityFeedback, ActivityQualityFeedback? activityFeedback,
]) async { ]) async {
try { // try {
debugPrint('Fetching new activity'); debugPrint('Fetching new activity');
_updateFetchingActivity(true);
// target tokens can be empty if activities have been completed for each
// it's set on initialization and then removed when each activity is completed
if (!pangeaController.languageController.languagesSet) {
debugger(when: kDebugMode);
_updateFetchingActivity(false);
return null;
}
if (!mounted) { _updateFetchingActivity(true);
debugger(when: kDebugMode);
_updateFetchingActivity(false);
return null;
}
if (widget.pangeaMessageEvent.messageDisplayRepresentation == null) { // target tokens can be empty if activities have been completed for each
debugger(when: kDebugMode); // it's set on initialization and then removed when each activity is completed
_updateFetchingActivity(false); if (!pangeaController.languageController.languagesSet) {
ErrorHandler.logError( debugger(when: kDebugMode);
e: Exception('No original message found in _fetchNewActivity'), _updateFetchingActivity(false);
data: { return null;
'event': widget.pangeaMessageEvent.event.toJson(), }
},
);
return null;
}
final PracticeActivityModelResponse? activityResponse =
await pangeaController.practiceGenerationController
.getPracticeActivity(
MessageActivityRequest(
userL1: pangeaController.languageController.userL1!.langCode,
userL2: pangeaController.languageController.userL2!.langCode,
messageText: widget.pangeaMessageEvent.messageDisplayText,
tokensWithXP: await widget.targetTokensController.targetTokens(
widget.pangeaMessageEvent,
),
messageId: widget.pangeaMessageEvent.eventId,
existingActivities: practiceActivities
.map((activity) => activity.activityRequestMetaData)
.toList(),
activityQualityFeedback: activityFeedback,
clientCompatibleActivities: widget
.ttsController.isLanguageFullySupported
? ActivityTypeEnum.values
: ActivityTypeEnum.values
.where((type) => type != ActivityTypeEnum.wordFocusListening)
.toList(),
),
widget.pangeaMessageEvent,
);
currentActivityCompleter = activityResponse?.eventCompleter; if (!mounted) {
debugger(when: kDebugMode);
_updateFetchingActivity(false); _updateFetchingActivity(false);
return null;
}
return activityResponse?.activity; if (widget.pangeaMessageEvent.messageDisplayRepresentation == null) {
} catch (e, s) {
debugger(when: kDebugMode); debugger(when: kDebugMode);
_updateFetchingActivity(false);
ErrorHandler.logError( ErrorHandler.logError(
e: e, e: Exception('No original message found in _fetchNewActivity'),
s: s,
m: 'Failed to get new activity',
data: { data: {
'activity': currentActivity, 'event': widget.pangeaMessageEvent.event.toJson(),
'record': currentCompletionRecord,
}, },
); );
return null; return null;
} }
final PracticeActivityModelResponse? activityResponse =
await pangeaController.practiceGenerationController.getPracticeActivity(
MessageActivityRequest(
userL1: pangeaController.languageController.userL1!.langCode,
userL2: pangeaController.languageController.userL2!.langCode,
messageText: widget.pangeaMessageEvent.messageDisplayText,
tokensWithXP: await widget.targetTokensController.targetTokens(
widget.pangeaMessageEvent,
),
messageId: widget.pangeaMessageEvent.eventId,
existingActivities: practiceActivities
.map((activity) => activity.activityRequestMetaData)
.toList(),
activityQualityFeedback: activityFeedback,
clientCompatibleActivities: widget
.ttsController.isLanguageFullySupported
? ActivityTypeEnum.values
: ActivityTypeEnum.values
.where((type) => type != ActivityTypeEnum.wordFocusListening)
.toList(),
),
widget.pangeaMessageEvent,
);
currentActivityCompleter = activityResponse?.eventCompleter;
_updateFetchingActivity(false);
return activityResponse?.activity;
// } catch (e, s) {
// debugger(when: kDebugMode);
// ErrorHandler.logError(
// e: e,
// s: s,
// m: 'Failed to get new activity',
// data: {
// 'activity': currentActivity,
// 'record': currentCompletionRecord,
// },
// );
// return null;
// }
} }
ConstructUseMetaData get metadata => ConstructUseMetaData( ConstructUseMetaData get metadata => ConstructUseMetaData(

Write Preview
Loading…
Cancel
Save