Merge 8034fd0 into 1da5ba5

FlashpointProject · Apr 28, 2020 · 688c555 · 688c555
2 parents 1da5ba5 + 8034fd0
commit 688c555
Show file tree

Hide file tree

Showing 9 changed files with 1,471 additions and 12 deletions.
diff --git a/lang/es-ES.json b/lang/es-ES.json
diff --git a/lang/pl-PL.json b/lang/pl-PL.json
diff --git a/lang/pt-BR.json b/lang/pt-BR.json
@@ -1,5 +1,5 @@
 {
-  "name": "Português",
+  "name": "Português (Brasil)",
   "config": {
     "configHeader": "Configuração",
     "configDesc": "(Você deve pressionar ''Salvar e Reiniciar'' para que algumas alterações tenham efeito)",
@@ -92,7 +92,7 @@
     "newGame": "Novo Jogo",
     "list": "Lista",
     "grid": "Grade",
-    "searchResults": "Search Results"
+    "searchResults": "Resultados da Pesquisa"
   },
   "filter": {
     "dateAdded": "Data Adicionada",
@@ -298,7 +298,7 @@
     "titlePlaceholder": "Título...",
     "noAuthor": "Sem Autor",
     "authorPlaceholder": "Autor...",
-    "by": "by"
+    "by": "por"
   },
   "misc": {
     "noBlankFound": "{0} Não Foi Encontrada",
@@ -361,4 +361,4 @@
     "screenshots": "Logotipos & Capturas de Tela",
     "screenshotsDesc": "Adiciona logotipos para exibição em grade e capturas de tela para todos os jogos."
   }
-}
+}
diff --git a/lang/ro-RO.json b/lang/ro-RO.json
diff --git a/lang/tr-TR.json b/lang/tr-TR.json
diff --git a/src/renderer/components/CurateBox.tsx b/src/renderer/components/CurateBox.tsx
@@ -89,7 +89,7 @@ export function CurateBox(props: CurateBoxProps) {
   const onLibraryChange             = useOnInputChange('library',             key, props.dispatch);
   const onNotesChange               = useOnInputChange('notes',               key, props.dispatch);
   const onOriginalDescriptionChange = useOnInputChange('originalDescription', key, props.dispatch);
-  const onAuthorNotesChange         = useOnInputChange('authorNotes',         key, props.dispatch);
+  const onCurationNotesChange       = useOnInputChange('curationNotes',       key, props.dispatch);
   const onExtremeChange             = useOnCheckboxToggle('extreme',          key, props.dispatch);
   // Callbacks for the fields (onItemSelect)
   const onPlayModeSelect            = useCallback(transformOnItemSelect(onPlayModeChange),        [onPlayModeChange]);
@@ -514,7 +514,7 @@ export function CurateBox(props: CurateBoxProps) {
   }, [props.curation && progressState[props.curation.key]]);
 
   // Meta
-  const authorNotes = props.curation && props.curation.meta.authorNotes || '';
+  const curationNotes = props.curation && props.curation.meta.curationNotes || '';
   // Misc
   const sharedInputProps = {
     editable: editable,
@@ -688,11 +688,11 @@ export function CurateBox(props: CurateBoxProps) {
           </CurateBoxRow>
           <CurateBoxRow title={strings.curate.curationNotes + ':'}>
             <InputField
-              text={authorNotes}
+              text={curationNotes}
               placeholder={strings.curate.noCurationNotes}
-              onChange={onAuthorNotesChange}
+              onChange={onCurationNotesChange}
               multiline={true}
-              className={authorNotes.length > 0 ? 'input-field--info' : ''}
+              className={curationNotes.length > 0 ? 'input-field--info' : ''}
               { ...sharedInputProps } />
           </CurateBoxRow>
           <CurateBoxRow title={strings.browse.extreme + ':'}>

diff --git a/src/shared/curate/metaToMeta.ts b/src/shared/curate/metaToMeta.ts
@@ -92,6 +92,7 @@ export function convertEditToCurationMeta(curation: EditCurationMeta, addApps?:
   parsed['Launch Command']       = curation.launchCommand;
   parsed['Game Notes']           = curation.notes;
   parsed['Original Description'] = curation.originalDescription;
+  parsed['Curation Notes']       = curation.curationNotes;
   // Add-apps meta
   const parsedAddApps: CurationFormatAddApps = {};
   if (addApps) {
@@ -159,6 +160,7 @@ export function convertParsedToCurationMeta(curation: ParsedCurationMeta): Curat
   parsed['Launch Command']       = curation.game.launchCommand;
   parsed['Game Notes']           = curation.game.notes;
   parsed['Original Description'] = curation.game.originalDescription;
+  parsed['Curation Notes']       = curation.game.curationNotes;
   // Add-apps meta
   const parsedAddApps: CurationFormatAddApps = {};
   if (curation.addApps) {
@@ -220,6 +222,7 @@ type CurationFormatMeta = {
   'Library'?: string;
   'Version'?: string;
   'Additional Applications'?: CurationFormatAddApps;
+  'Curation Notes'?: string;
 };
 
 type CurationFormatAddApps = {

diff --git a/src/shared/curate/parse.ts b/src/shared/curate/parse.ts
@@ -69,13 +69,13 @@ export function convertMeta(data: any, onError?: (error: string) => void): Parse
     onError: onError && (e => onError(`Error while converting Curation Meta: ${e.toString()}`))
   });
   // -- Old curation format --
-  parser.prop('author notes',         v => parsed.game.authorNotes         = str(v));
+  parser.prop('author notes',         v => parsed.game.curationNotes       = str(v));
   parser.prop('genre',                v => parsed.game.tags                = arrayStr(v));
   parser.prop('notes',                v => parsed.game.notes               = str(v));
   // -- New curation format --
   // Single value properties
   parser.prop('application path',     v => parsed.game.applicationPath     = str(v));
-  parser.prop('curation notes',       v => parsed.game.authorNotes         = str(v));
+  parser.prop('curation notes',       v => parsed.game.curationNotes       = str(v));
   parser.prop('developer',            v => parsed.game.developer           = arrayStr(v));
   parser.prop('extreme',              v => parsed.game.extreme             = str(v));
   parser.prop('game notes',           v => parsed.game.notes               = str(v));

diff --git a/src/shared/curate/types.ts b/src/shared/curate/types.ts
@@ -45,7 +45,7 @@ export type EditCurationMeta = Partial<{
   launchCommand: string;
   library: string;
   notes: string;
-  authorNotes: string;
+  curationNotes: string;
   platform: string;
   applicationPath: string;
   playMode: string;