Merge branch 'develop'

elsoftpy · Oct 30, 2018 · a9e9760 · a9e9760
2 parents 966d05d + e3e7e78
commit a9e9760
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/resources/lang/en/reportReport.php b/resources/lang/en/reportReport.php
@@ -2,6 +2,7 @@
 return [
     "button_currency_gs"        => "Convert to GS.",
     "button_currency_us"        => "Convert to U\$D",
+    "button_currency_cas"       =>  "Convert to CA\$",
     "p_currency_gs"             => "Values shown in thousands of Guaraníes",
     "p_currency_us"             => "Values shown in American Dollars",
     "label_tab_universe"        => "All Participants",

diff --git a/resources/lang/es/reportReport.php b/resources/lang/es/reportReport.php
@@ -2,6 +2,7 @@
 return [
     "button_currency_gs"        => "Ver en GS.",
     "button_currency_us"        => "Ver en U\$D.",
+    "button_currency_cas"       =>  "Ver en CA\$",
     "p_currency_gs"             => "Los montos están en miles de Guaraníes",
     "p_currency_us"             => "Los montos están en Dólares Americanos",
     "label_tab_universe"        => "Universo",

diff --git a/resources/views/report/report.blade.php b/resources/views/report/report.blade.php
@@ -39,7 +39,7 @@
 					<input type="hidden" name="periodo" value="{{$periodo}}"/>
 					<button class="btn waves-effect waves-light lighten-1 red white-text" type="submit" name="submitFilter" id="submitFilter">
 						@if ($dbEmpresa->id == 95)
-							<i class="material-icons left">monetization_on</i>Ver en CA$	
+							<i class="material-icons left">monetization_on</i>@lang('reportReport.button_currency_cas')	
 						@else
 							<i class="material-icons left">monetization_on</i>@lang('reportReport.button_currency_us')	
 						@endif