Skip to content

Commit

Permalink
removed addresses lang file
Browse files Browse the repository at this point in the history
  • Loading branch information
CihanSenturk committed Sep 3, 2021
1 parent 6154ff3 commit c809bf7
Show file tree
Hide file tree
Showing 16 changed files with 39 additions and 43 deletions.
2 changes: 1 addition & 1 deletion app/Http/ViewComposers/Wizard.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ protected function getTransalations()
'logo' => trans('settings.company.logo'),
'skip' => trans('general.skip'),
'save' => trans('general.save'),
'country' => trans_choice('addresses.countries', 1),
'country' => trans_choice('general.countries', 1),
],

'currencies' => [
Expand Down
8 changes: 0 additions & 8 deletions resources/lang/en-GB/addresses.php

This file was deleted.

4 changes: 4 additions & 0 deletions resources/lang/en-GB/general.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@
'sales' => 'Sale|Sales',
'purchases' => 'Purchase|Purchases',
'notifications' => 'Notification|Notifications',
'countries' => 'Country|Countries',
'cities' => 'Town/City|Towns/Cities',

'welcome' => 'Welcome',
'banking' => 'Banking',
Expand Down Expand Up @@ -164,6 +166,8 @@
'amount_due' => 'Amount due',
'financial_year' => 'Financial Year',
'created' => 'Created',
'state' => 'Province/State',
'zip_code' => 'Postal/Zip code',

'card' => [
'cards' => 'Card|Cards',
Expand Down
8 changes: 4 additions & 4 deletions resources/views/common/companies/create.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@

{{ Form::textareaGroup('address', trans('general.address')) }}

{{ Form::textGroup('city', trans_choice('addresses.cities', 1), 'city', [], setting('company.city')) }}
{{ Form::textGroup('city', trans_choice('general.cities', 1), 'city', [], setting('company.city')) }}

{{ Form::textGroup('zip_code', trans('addresses.zip_code'), 'mail-bulk', [], setting('company.zip_code')) }}
{{ Form::textGroup('zip_code', trans('general.zip_code'), 'mail-bulk', [], setting('company.zip_code')) }}

{{ Form::textGroup('state', trans('addresses.state'), 'city', [], setting('company.state')) }}
{{ Form::textGroup('state', trans('general.state'), 'city', [], setting('company.state')) }}

{{ Form::selectGroup('country', trans_choice('addresses.countries', 1), 'globe-americas', trans('countries'), setting('company.country'), []) }}
{{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), setting('company.country'), []) }}

{{ Form::fileGroup('logo', trans('companies.logo'), '', ['dropzone-class' => 'form-file']) }}

Expand Down
8 changes: 4 additions & 4 deletions resources/views/common/companies/edit.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@

{{ Form::textareaGroup('address', trans('general.address')) }}

{{ Form::textGroup('city', trans_choice('addresses.cities', 1), 'city', []) }}
{{ Form::textGroup('city', trans_choice('general.cities', 1), 'city', []) }}

{{ Form::textGroup('zip_code', trans('addresses.zip_code'), 'mail-bulk', []) }}
{{ Form::textGroup('zip_code', trans('general.zip_code'), 'mail-bulk', []) }}

{{ Form::textGroup('state', trans('addresses.state'), 'city', []) }}
{{ Form::textGroup('state', trans('general.state'), 'city', []) }}

{{ Form::selectGroup('country', trans_choice('addresses.countries', 1), 'globe-americas', trans('countries'), $company->country, []) }}
{{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), $company->country, []) }}

{{ Form::fileGroup('logo', trans('companies.logo'), '', ['dropzone-class' => 'form-file'], $company->company_logo) }}

Expand Down
2 changes: 1 addition & 1 deletion resources/views/modals/companies/edit.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

{{ Form::textareaGroup('address', trans('settings.company.address'), null, setting('company.address')) }}

{{ Form::selectGroup('country', trans_choice('addresses.countries', 1), 'globe-americas', trans('countries'), setting('company.country'), []) }}
{{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), setting('company.country'), []) }}

{!! Form::hidden('_prefix', 'company') !!}
</div>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/modals/customers/create.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

{{ Form::textareaGroup('address', trans('general.address')) }}

{{ Form::selectGroup('country', trans_choice('addresses.countries', 1), 'globe-americas', trans('countries'), setting('default.country'), []) }}
{{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), setting('default.country'), []) }}

{{ Form::hidden('type', 'customer') }}
{!! Form::hidden('enabled', '1', []) !!}
Expand Down
2 changes: 1 addition & 1 deletion resources/views/modals/customers/edit.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

{{ Form::textareaGroup('address', trans('general.address'), null, $customer->address) }}

{{ Form::selectGroup('country', trans_choice('addresses.countries', 1), 'globe-americas', trans('countries'), $customer->country, []) }}
{{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), $customer->country, []) }}

{{ Form::hidden('type', 'customer') }}
{!! Form::hidden('enabled', '1', []) !!}
Expand Down
2 changes: 1 addition & 1 deletion resources/views/modals/vendors/create.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

{{ Form::textareaGroup('address', trans('general.address')) }}

{{ Form::selectGroup('country', trans_choice('addresses.countries', 1), 'globe-americas', trans('countries'), setting('default.country'), []) }}
{{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), setting('default.country'), []) }}

{{ Form::hidden('type', 'vendor') }}
{!! Form::hidden('enabled', '1', []) !!}
Expand Down
2 changes: 1 addition & 1 deletion resources/views/modals/vendors/edit.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

{{ Form::textareaGroup('address', trans('general.address'), null, $vendor->address) }}

{{ Form::selectGroup('country', trans_choice('addresses.countries', 1), 'globe-americas', trans('countries'), $vendor->country, []) }}
{{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), $vendor->country, []) }}

{{ Form::hidden('type', 'vendor') }}
{!! Form::hidden('enabled', '1', []) !!}
Expand Down
8 changes: 4 additions & 4 deletions resources/views/purchases/vendors/create.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@

{{ Form::textareaGroup('address', trans('general.address')) }}

{{ Form::textGroup('city', trans_choice('addresses.cities', 1), 'city', []) }}
{{ Form::textGroup('city', trans_choice('general.cities', 1), 'city', []) }}

{{ Form::textGroup('zip_code', trans('addresses.zip_code'), 'mail-bulk', []) }}
{{ Form::textGroup('zip_code', trans('general.zip_code'), 'mail-bulk', []) }}

{{ Form::textGroup('state', trans('addresses.state'), 'city', []) }}
{{ Form::textGroup('state', trans('general.state'), 'city', []) }}

{{ Form::selectGroup('country', trans_choice('addresses.countries', 1), 'globe-americas', trans('countries'), setting('default.country'), []) }}
{{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), setting('default.country'), []) }}

{{ Form::fileGroup('logo', trans_choice('general.pictures', 1), '', ['dropzone-class' => 'form-file']) }}

Expand Down
8 changes: 4 additions & 4 deletions resources/views/purchases/vendors/edit.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@

{{ Form::textareaGroup('address', trans('general.address')) }}

{{ Form::textGroup('city', trans_choice('addresses.cities', 1), 'city', []) }}
{{ Form::textGroup('city', trans_choice('general.cities', 1), 'city', []) }}

{{ Form::textGroup('zip_code', trans('addresses.zip_code'), 'mail-bulk', []) }}
{{ Form::textGroup('zip_code', trans('general.zip_code'), 'mail-bulk', []) }}

{{ Form::textGroup('state', trans('addresses.state'), 'city', []) }}
{{ Form::textGroup('state', trans('general.state'), 'city', []) }}

{{ Form::selectGroup('country', trans_choice('addresses.countries', 1), 'globe-americas', trans('countries'), $vendor->country, []) }}
{{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), $vendor->country, []) }}

{{ Form::fileGroup('logo', trans_choice('general.logos', 1), '', ['dropzone-class' => 'form-file']) }}

Expand Down
8 changes: 4 additions & 4 deletions resources/views/sales/customers/create.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@

{{ Form::textareaGroup('address', trans('general.address')) }}

{{ Form::textGroup('city', trans_choice('addresses.cities', 1), 'city', []) }}
{{ Form::textGroup('city', trans_choice('general.cities', 1), 'city', []) }}

{{ Form::textGroup('zip_code', trans('addresses.zip_code'), 'mail-bulk', []) }}
{{ Form::textGroup('zip_code', trans('general.zip_code'), 'mail-bulk', []) }}

{{ Form::textGroup('state', trans('addresses.state'), 'city', []) }}
{{ Form::textGroup('state', trans('general.state'), 'city', []) }}

{{ Form::selectGroup('country', trans_choice('addresses.countries', 1), 'globe-americas', trans('countries'), setting('default.country'), []) }}
{{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), setting('default.country'), []) }}

{{ Form::textGroup('reference', trans('general.reference'), 'file', []) }}

Expand Down
8 changes: 4 additions & 4 deletions resources/views/sales/customers/edit.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@

{{ Form::textareaGroup('address', trans('general.address')) }}

{{ Form::textGroup('city', trans_choice('addresses.cities', 1), 'city', []) }}
{{ Form::textGroup('city', trans_choice('general.cities', 1), 'city', []) }}

{{ Form::textGroup('zip_code', trans('addresses.zip_code'), 'mail-bulk', []) }}
{{ Form::textGroup('zip_code', trans('general.zip_code'), 'mail-bulk', []) }}

{{ Form::textGroup('state', trans('addresses.state'), 'city', []) }}
{{ Form::textGroup('state', trans('general.state'), 'city', []) }}

{{ Form::selectGroup('country', trans_choice('addresses.countries', 1), 'globe-americas', trans('countries'), $customer->country, []) }}
{{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), $customer->country, []) }}

{{ Form::textGroup('reference', trans('general.reference'), 'file', []) }}

Expand Down
8 changes: 4 additions & 4 deletions resources/views/settings/company/edit.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@

{{ Form::textareaGroup('address', trans('settings.company.address'), null, setting('company.address')) }}

{{ Form::textGroup('city', trans_choice('addresses.cities', 1), 'city', [], setting('company.city')) }}
{{ Form::textGroup('city', trans_choice('general.cities', 1), 'city', [], setting('company.city')) }}

{{ Form::textGroup('zip_code', trans('addresses.zip_code'), 'mail-bulk', [], setting('company.zip_code')) }}
{{ Form::textGroup('zip_code', trans('general.zip_code'), 'mail-bulk', [], setting('company.zip_code')) }}

{{ Form::textGroup('state', trans('addresses.state'), 'city', [], setting('company.state')) }}
{{ Form::textGroup('state', trans('general.state'), 'city', [], setting('company.state')) }}

{{ Form::selectGroup('country', trans_choice('addresses.countries', 1), 'globe-americas', trans('countries'), setting('company.country'), []) }}
{{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), setting('company.country'), []) }}

{{ Form::fileGroup('logo', trans('settings.company.logo'), 'file-image-o', [], setting('company.logo')) }}
</div>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/settings/default/edit.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

{{ Form::selectGroup('locale', trans_choice('general.languages', 1), 'flag', language()->allowed(), setting('default.locale'), []) }}

{{ Form::selectGroup('country', trans_choice('addresses.countries', 1), 'globe-americas', trans('countries'), setting('default.country'), []) }}
{{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), setting('default.country'), []) }}

{{ Form::selectGroup('list_limit', trans('settings.default.list_limit'), 'columns', ['10' => '10', '25' => '25', '50' => '50', '100' => '100'], setting('default.list_limit'), []) }}

Expand Down

0 comments on commit c809bf7

Please sign in to comment.