From aa75264e3c116d7e32a67cf9bd4cd6d079a76309 Mon Sep 17 00:00:00 2001 From: Rogerio Chaves Date: Thu, 26 Jan 2017 11:57:20 -0200 Subject: [PATCH] Move fields translations back to internationalization file --- jarbas/frontend/elm/Internationalization.elm | 206 ++++++++++++++++++- jarbas/frontend/elm/Reimbursement/Fields.elm | 119 ++++------- 2 files changed, 236 insertions(+), 89 deletions(-) diff --git a/jarbas/frontend/elm/Internationalization.elm b/jarbas/frontend/elm/Internationalization.elm index cd2289f..a65bd7a 100644 --- a/jarbas/frontend/elm/Internationalization.elm +++ b/jarbas/frontend/elm/Internationalization.elm @@ -1,4 +1,4 @@ -module Internationalization exposing (Language(..), TranslationId(..), TranslationSet, translate, translateSet) +module Internationalization exposing (Language(..), TranslationId(..), TranslationSet, translate) type alias TranslationSet = @@ -27,6 +27,44 @@ type TranslationId | FieldsetCurrencyDetails | FieldsetCurrencyDetailsLink | FieldIssueDateValidation + | FieldYear + | FieldDocumentId + | FieldApplicantId + | FieldTotalReimbursementValue + | FieldTotalNetValue + | FieldReimbursementNumbers + | FieldNetValues + | FieldCongresspersonId + | FieldCongressperson + | FieldCongresspersonName + | FieldCongresspersonDocument + | FieldState + | FieldParty + | FieldTermId + | FieldTerm + | FieldSubquotaId + | FieldSubquotaDescription + | FieldSubquotaGroupId + | FieldSubquotaGroupDescription + | FieldCompany + | FieldCnpjCpf + | FieldDocumentType + | FieldDocumentNumber + | FieldDocumentValue + | FieldIssueDate + | FieldIssueDateStart + | FieldIssueDateEnd + | FieldClaimDate + | FieldMonth + | FieldRemarkValue + | FieldInstallment + | FieldBatchNumber + | FieldReimbursementValues + | FieldPassenger + | FieldLegOfTheTrip + | FieldProbability + | FieldSuspicions + | FieldEmpty | ReimbursementSource | ReimbursementChamberOfDeputies | ReceiptFetch @@ -139,6 +177,157 @@ translate lang trans = TranslationSet "Please use the YYYY-MM-DD format" "Por favor, utilize o formato YYYY-MM-DD" + FieldYear -> + TranslationSet "Year" + "Ano" + + FieldDocumentId -> + TranslationSet "Document ID" + "ID do documento" + + FieldApplicantId -> + TranslationSet "Applicant ID" + "Identificador do Solicitante" + + FieldTotalReimbursementValue -> + TranslationSet "Total reimbursement value" + "Valor total dos reembolsos" + + FieldTotalNetValue -> + TranslationSet "Total net value" + "Valor líquido total" + + FieldReimbursementNumbers -> + TranslationSet "Reimbursement number" + "Número dos reembolsos" + + FieldNetValues -> + TranslationSet "Net values" + "Valores líquidos" + + FieldCongresspersonId -> + TranslationSet "Congressperson ID" + "Cadastro do Parlamentar" + + FieldCongressperson -> + TranslationSet "Congressperson" + "Deputado(a)" + + FieldCongresspersonName -> + TranslationSet "Congressperson nome" + "Nome do(a) deputado(a)" + + FieldCongresspersonDocument -> + TranslationSet "Congressperson document" + "Número da Carteira Parlamentar" + + FieldState -> + TranslationSet "State" + "UF" + + FieldParty -> + TranslationSet "Party" + "Partido" + + FieldTermId -> + TranslationSet "Term ID" + "Código da legislatura" + + FieldTerm -> + TranslationSet "Term" + "Número da legislatura" + + FieldSubquotaId -> + TranslationSet "Subquota number" + "Número da Subcota" + + FieldSubquotaDescription -> + TranslationSet "Subquota" + "Subquota" + + FieldSubquotaGroupId -> + TranslationSet "Subquota group number" + "Número da especificação da subcota" + + FieldSubquotaGroupDescription -> + TranslationSet "Subquota group" + "Especificação da subcota" + + FieldCompany -> + TranslationSet "Company" + "Fornecedor" + + FieldCnpjCpf -> + TranslationSet "CNPJ or CPF" + "CNPJ ou CPF" + + FieldDocumentType -> + TranslationSet "Document type" + "Tipo do documento" + + FieldDocumentNumber -> + TranslationSet "Document number" + "Número do documento" + + FieldDocumentValue -> + TranslationSet "Expense value" + "Valor da despesa" + + FieldIssueDate -> + TranslationSet "Expense date" + "Data da despesa" + + FieldIssueDateStart -> + TranslationSet "Expense date (start)" + "Data da despesa (início)" + + FieldIssueDateEnd -> + TranslationSet "Expense date (end)" + "Data da despesa (fim)" + + FieldClaimDate -> + TranslationSet "Claim date" + "Data do pedido de reembolso" + + FieldMonth -> + TranslationSet "Month" + "Mês" + + FieldRemarkValue -> + TranslationSet "Remark value" + "Valor da glosa" + + FieldInstallment -> + TranslationSet "Installment" + "Número da parcela" + + FieldBatchNumber -> + TranslationSet "Batch number" + "Número do lote" + + FieldReimbursementValues -> + TranslationSet "Reimbursement values" + "Valor dos reembolsos" + + FieldPassenger -> + TranslationSet "Passenger" + "Passageiro" + + FieldLegOfTheTrip -> + TranslationSet "Leg of the trip" + "Trecho" + + FieldProbability -> + TranslationSet "Probability" + "Probabilidade" + + FieldSuspicions -> + TranslationSet "Suspicions" + "Suspeitas" + + FieldEmpty -> + TranslationSet "" "" + ReimbursementSource -> TranslationSet "Source: " "Fonte: " @@ -363,14 +552,9 @@ translate lang trans = TranslationSet "" "" in - translateSet lang translationSet - - -translateSet : Language -> TranslationSet -> String -translateSet lang translationSet = - case lang of - English -> - translationSet.english + case lang of + English -> + translationSet.english - Portuguese -> - translationSet.portuguese + Portuguese -> + translationSet.portuguese diff --git a/jarbas/frontend/elm/Reimbursement/Fields.elm b/jarbas/frontend/elm/Reimbursement/Fields.elm index 4de8f89..116a3e4 100644 --- a/jarbas/frontend/elm/Reimbursement/Fields.elm +++ b/jarbas/frontend/elm/Reimbursement/Fields.elm @@ -1,6 +1,6 @@ module Reimbursement.Fields exposing (..) -import Internationalization exposing (Language(..), TranslationId(..), TranslationSet, translateSet) +import Internationalization exposing (Language(..), TranslationId(..), TranslationSet, translate) import List.Extra @@ -163,157 +163,120 @@ getLabel (Field label _) = getLabelTranslation : Language -> Field -> String getLabelTranslation language (Field label _) = let - translationSet = + translationId = case label of Year -> - TranslationSet "Year" - "Ano" + FieldYear DocumentId -> - TranslationSet "Document ID" - "ID do documento" + FieldDocumentId ApplicantId -> - TranslationSet "Applicant ID" - "Identificador do Solicitante" + FieldApplicantId TotalReimbursementValue -> - TranslationSet "Total reimbursement value" - "Valor total dos reembolsos" + FieldTotalReimbursementValue TotalNetValue -> - TranslationSet "Total net value" - "Valor líquido total" + FieldTotalNetValue ReimbursementNumbers -> - TranslationSet "Reimbursement number" - "Número dos reembolsos" + FieldReimbursementNumbers NetValues -> - TranslationSet "Net values" - "Valores líquidos" + FieldNetValues CongresspersonId -> - TranslationSet "Congressperson ID" - "Cadastro do Parlamentar" + FieldCongresspersonId Congressperson -> - TranslationSet "Congressperson" - "Deputado(a)" + FieldCongressperson CongresspersonName -> - TranslationSet "Congressperson nome" - "Nome do(a) deputado(a)" + FieldCongresspersonName CongresspersonDocument -> - TranslationSet "Congressperson document" - "Número da Carteira Parlamentar" + FieldCongresspersonDocument State -> - TranslationSet "State" - "UF" + FieldState Party -> - TranslationSet "Party" - "Partido" + FieldParty TermId -> - TranslationSet "Term ID" - "Código da legislatura" + FieldTermId Term -> - TranslationSet "Term" - "Número da legislatura" + FieldTerm SubquotaId -> - TranslationSet "Subquota number" - "Número da Subcota" + FieldSubquotaId SubquotaDescription -> - TranslationSet "Subquota" - "Subquota" + FieldSubquotaDescription SubquotaGroupId -> - TranslationSet "Subquota group number" - "Número da especificação da subcota" + FieldSubquotaGroupId SubquotaGroupDescription -> - TranslationSet "Subquota group" - "Especificação da subcota" + FieldSubquotaGroupDescription Company -> - TranslationSet "Company" - "Fornecedor" + FieldCompany CnpjCpf -> - TranslationSet "CNPJ or CPF" - "CNPJ ou CPF" + FieldCnpjCpf DocumentType -> - TranslationSet "Document type" - "Tipo do documento" + FieldDocumentType DocumentNumber -> - TranslationSet "Document number" - "Número do documento" + FieldDocumentNumber DocumentValue -> - TranslationSet "Expense value" - "Valor da despesa" + FieldDocumentValue IssueDate -> - TranslationSet "Expense date" - "Data da despesa" + FieldIssueDate IssueDateStart -> - TranslationSet "Expense date (start)" - "Data da despesa (início)" + FieldIssueDateStart IssueDateEnd -> - TranslationSet "Expense date (end)" - "Data da despesa (fim)" + FieldIssueDateEnd ClaimDate -> - TranslationSet "Claim date" - "Data do pedido de reembolso" + FieldClaimDate Month -> - TranslationSet "Month" - "Mês" + FieldMonth RemarkValue -> - TranslationSet "Remark value" - "Valor da glosa" + FieldRemarkValue Installment -> - TranslationSet "Installment" - "Número da parcela" + FieldInstallment BatchNumber -> - TranslationSet "Batch number" - "Número do lote" + FieldBatchNumber ReimbursementValues -> - TranslationSet "Reimbursement values" - "Valor dos reembolsos" + FieldReimbursementValues Passenger -> - TranslationSet "Passenger" - "Passageiro" + FieldPassenger LegOfTheTrip -> - TranslationSet "Leg of the trip" - "Trecho" + FieldLegOfTheTrip Probability -> - TranslationSet "Probability" - "Probabilidade" + FieldProbability Suspicions -> - TranslationSet "Suspicions" - "Suspeitas" + FieldSuspicions Empty -> - TranslationSet "" "" + FieldEmpty in - translateSet language translationSet + translate language translationId