Skip to content

Commit

Permalink
Merge branch 'pierre-H-patch-2'
Browse files Browse the repository at this point in the history
  • Loading branch information
songecko committed Jun 25, 2019
2 parents 3a911b8 + 79c80db commit 9cb1609
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 19 deletions.
6 changes: 3 additions & 3 deletions src/DataFetcher/TimePeriodDataFetcher.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ abstract class TimePeriodDataFetcher extends BaseDataFetcher
public static function getPeriodChoices()
{
return [
'Daily' => self::PERIOD_DAY,
'Monthly' => self::PERIOD_MONTH,
'Yearly' => self::PERIOD_YEAR,
'odiseo_sylius_report.ui.daily' => self::PERIOD_DAY,
'odiseo_sylius_report.ui.monthly' => self::PERIOD_MONTH,
'odiseo_sylius_report.ui.yearly' => self::PERIOD_YEAR,
];
}

Expand Down
3 changes: 3 additions & 0 deletions src/Resources/translations/messages.en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ odiseo_sylius_report:
edit_report: Edit report
there_are_no_reports_results: No report results
export: Export
daily: Daily
monthly: Monthly
yearly: Yearly
form:
report:
name: Name
Expand Down
35 changes: 19 additions & 16 deletions src/Resources/translations/messages.es.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,15 @@ odiseo_sylius_report:
manage_reports: Administrar reportes
renderers: Renderizadores
data_fetchers: Obtención de datos
no_data: No data
no_data: Sin datos
new_report: Nuevo reporte
show_report: Ver reporte
edit_report: Editar reporte
there_are_no_reports_results: No se encontraron resultados para este reporte
export: Exportar
daily: Diario
monthly: Mensual
yearly: Anual
form:
report:
name: Nombre
Expand All @@ -21,10 +24,10 @@ odiseo_sylius_report:
chart:
type: Tipo
time_period:
start: Start date
end: End date
period: Time period
empty_records: Print empty records?
start: Fecha desde
end: Fecha hasta
period: Período de fecha
empty_records: Imprimir resultados vacios?
user_gender: Genero del usuario
shipping_country: País de envío
shipping_city: Ciudad de envío
Expand All @@ -34,19 +37,19 @@ odiseo_sylius_report:
billing_city: Ciudad de facturación
billing_province: Provincia de facturación
billing_postcode: Código postal de facturación
orders: Ordenes
orders: Órdenes
all_channels: Todos los canales
category: Categoría
renderer:
chart: Chart renderer
table: Table renderer
chart: Renderizador por gráfico
table: Renderizador por tabla
data_fetcher:
user_registration: User registration
sales_total: Sales Total
number_of_orders: Number of orders
user_registration: Registración de usuario
sales_total: Total de ventas
number_of_orders: Cantidad de órdenes

odiseo_sylius_report_renderer_table: Table renderer
odiseo_sylius_report_renderer_chart: Chart renderer
odiseo_sylius_report_data_fetcher_user_registration: User Registration
odiseo_sylius_report_data_fetcher_sales_total: Sales Total
odiseo_sylius_report_number_of_orders: Number of orders
odiseo_sylius_report_renderer_table: Renderizador por tabla
odiseo_sylius_report_renderer_chart: Renderizador por gráfico
odiseo_sylius_report_data_fetcher_user_registration: Registración de usuario
odiseo_sylius_report_data_fetcher_sales_total: Total de ventas
odiseo_sylius_report_data_fetcher_number_of_orders: Cantidad de órdenes

0 comments on commit 9cb1609

Please sign in to comment.