Skip to content

Commit

Permalink
Merge pull request #530 from lomamech/usingPLACEHOLDERS
Browse files Browse the repository at this point in the history
Change PLACE_HOLDERS to PLACEHOLDERS
  • Loading branch information
jniles authored Jun 24, 2016
2 parents cbaaa57 + 6105d8d commit 66e7386
Show file tree
Hide file tree
Showing 21 changed files with 42 additions and 42 deletions.
2 changes: 1 addition & 1 deletion client/src/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@
"CREATION" : "Creation",
"EDITION" : "Edition"
},
"PLACE_HOLDERS": {
"PLACEHOLDERS": {
"ENTER_ACCOUNT" : "Enter account",
"ENTER_CODE" : "Entrer code",
"ENTER_COUNTRY" : "Enter Country",
Expand Down
2 changes: 1 addition & 1 deletion client/src/i18n/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@
"CREATION" : "Creation",
"EDITION" : "Edition"
},
"PLACE_HOLDERS": {
"PLACEHOLDERS": {
"ENTER_ACCOUNT" : "Entrer le compte",
"ENTER_CODE" : "Entrer le code",
"ENTER_COUNTRY" : "Entrer le nom pays",
Expand Down
4 changes: 2 additions & 2 deletions client/src/js/components/bhFindPatient.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ function FindPatientComponent(Patients, AppCache) {
vm.options = {
findById : {
'label' : 'FORM.LABELS.PATIENT_ID',
'placeholder' : 'FORM.PLACE_HOLDERS.SEARCH_PATIENT_ID'
'placeholder' : 'FORM.PLACEHOLDERS.SEARCH_PATIENT_ID'
},
findByName : {
'label' : 'FORM.LABELS.PATIENT_NAME',
'placeholder' : 'FORM.PLACE_HOLDERS.SEARCH_NAME'
'placeholder' : 'FORM.PLACEHOLDERS.SEARCH_NAME'
}
};

Expand Down
4 changes: 2 additions & 2 deletions client/src/partials/accounts/accounts.html
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ <h4>{{ 'FORM.INFOS.UPDATE_SUCCESS' | translate }}</h4>

<div class="form-group" ng-class="{ 'has-error' : CreateForm.$submitted && CreateForm.label.$invalid }">
<label class="control-label">{{ "FORM.LABELS.ACCOUNT_TITLE" | translate }}</label>
<input type="text" placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_ACCOUNT' | translate }}" ng-maxlength="AccountsCtrl.maxLength" class="form-control" name="label" ng-model="AccountsCtrl.account.label" required>
<input type="text" placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_ACCOUNT' | translate }}" ng-maxlength="AccountsCtrl.maxLength" class="form-control" name="label" ng-model="AccountsCtrl.account.label" required>
<div class="help-block" ng-messages="CreateForm.label.$error" ng-show="CreateForm.$submitted">
<div ng-messages-include="partials/templates/messages.tmpl.html"></div>
</div>
Expand Down Expand Up @@ -248,7 +248,7 @@ <h4>{{ 'FORM.INFOS.UPDATE_SUCCESS' | translate }}</h4>
<form class="panel-body" name="UpdateForm" ng-submit="AccountsCtrl.submit(UpdateForm)" autocomplete="off" autocapitalize="off" autocorrect="off" novalidate>
<div class="form-group" ng-class="{ 'has-error' : UpdateForm.$submitted && UpdateForm.label.$invalid }">
<label class="control-label">{{ "FORM.LABELS.ACCOUNT_TITLE" | translate }}</label>
<input type="text" placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_ACCOUNT' | translate }}" ng-maxlength="AccountsCtrl.maxLength" class="form-control" name="label" ng-model="AccountsCtrl.account.label" required>
<input type="text" placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_ACCOUNT' | translate }}" ng-maxlength="AccountsCtrl.maxLength" class="form-control" name="label" ng-model="AccountsCtrl.account.label" required>
<div class="help-block" ng-messages="UpdateForm.label.$error" ng-show="UpdateForm.$submitted">
<div ng-messages-include="partials/templates/messages.tmpl.html"></div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions client/src/partials/billing_services/modal.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ <h4>{{ BillingServicesFormCtrl.title | translate }}<span ng-show="BillingService
class="form-control"
name="account"
ng-model="BillingServicesFormCtrl.model.account"
placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_ACCOUNT' | translate }}"
placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_ACCOUNT' | translate }}"
uib-typeahead="account as account.hrlabel for account in BillingServicesFormCtrl.accounts | filter:$viewValue | limitTo:6"
typeahead-editable="false"
typeahead-template-url="partials/templates/typeahead/accounts.html"
Expand Down Expand Up @@ -59,7 +59,7 @@ <h4>{{ BillingServicesFormCtrl.title | translate }}<span ng-show="BillingService
class="form-control"
name="description"
ng-model="BillingServicesFormCtrl.model.description"
placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_DESCRIPTION' | translate }}"
placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_DESCRIPTION' | translate }}"
ng-maxlength="BillingServicesFormCtrl.maxLength"
required>
</textarea>
Expand Down
2 changes: 1 addition & 1 deletion client/src/partials/debtors/groups.edit.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<input
class="form-control"
name="account_id"
placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_ACCOUNT' | translate }}..."
placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_ACCOUNT' | translate }}..."
uib-typeahead="account as account.hrlabel for account in GroupEditCtrl.accounts | filter:$viewValue | limitTo:10"
typeahead-template-url="partials/templates/typeahead/accounts.html"
typeahead-editable="false"
Expand Down
2 changes: 1 addition & 1 deletion client/src/partials/debtors/groups.list.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</div>
</div>

<input ng-model="GroupCtrl.filter" ng-show="GroupCtrl.filterActive" class="form-control" placeholder="{{'FORM.PLACE_HOLDERS.FILTER_NAME' | translate }}" style="border-radius: 0"></input>
<input ng-model="GroupCtrl.filter" ng-show="GroupCtrl.filterActive" class="form-control" placeholder="{{'FORM.PLACEHOLDERS.FILTER_NAME' | translate }}" style="border-radius: 0"></input>
</div>

<div
Expand Down
2 changes: 1 addition & 1 deletion client/src/partials/donors/donors.html
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ <h4>{{ "DONOR_MANAGEMENT.TITLE" | translate }}</h4>
<input
class="form-control"
name="name"
placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_NAME' | translate }}..."
placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_NAME' | translate }}..."
ng-maxlength="DonorCtrl.maxLength"
ng-model="DonorCtrl.donor.name" required>
<div class="help-block" ng-messages="ActionForm.name.$error" ng-show="ActionForm.$submitted">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
class="form-control"
type="text"
name="name"
placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_NAME' | translate }}..."
placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_NAME' | translate }}..."
required>
<div class="help-block" ng-messages="ActionForm.name.$error" ng-show="ActionForm.$submitted">
<div ng-messages-include="partials/templates/messages.tmpl.html"></div>
Expand All @@ -28,7 +28,7 @@
class="form-control"
type="text"
name="code"
placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_CODE' | translate }}..."
placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_CODE' | translate }}..."
required>
<div class="help-block" ng-messages="ActionForm.code.$error" ng-show="ActionForm.$submitted">
<div ng-messages-include="partials/templates/messages.tmpl.html"></div>
Expand All @@ -45,7 +45,7 @@
uib-typeahead="acc as acc.hrlabel for acc in $ctrl.accountList | filter:$viewValue | limitTo:8"
typeahead-template-url="partials/templates/typeahead/accounts.html"
typeahead-editable="true"
placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_ACCOUNT' | translate }}..."
placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_ACCOUNT' | translate }}..."
required>
<div class="help-block" ng-messages="ActionForm.salesAccount.$error" ng-show="ActionForm.$submitted">
<div ng-messages-include="partials/templates/messages.tmpl.html"></div>
Expand All @@ -61,7 +61,7 @@
uib-typeahead="acc as acc.hrlabel for acc in $ctrl.accountList | filter:$viewValue | limitTo:8"
typeahead-template-url="partials/templates/typeahead/accounts.html"
typeahead-editable="true"
placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_ACCOUNT' | translate }}..."
placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_ACCOUNT' | translate }}..."
>
</div>

Expand All @@ -74,7 +74,7 @@
uib-typeahead="acc as acc.hrlabel for acc in $ctrl.accountList | filter:$viewValue | limitTo:8"
typeahead-template-url="partials/templates/typeahead/accounts.html"
typeahead-editable="true"
placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_ACCOUNT' | translate }}..."
placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_ACCOUNT' | translate }}..."
>
</div>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
class="form-control"
type="text"
name="text"
placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_NAME' | translate }}..."
placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_NAME' | translate }}..."
required>
<div class="help-block" ng-messages="ActionForm.text.$error" ng-show="ActionForm.$submitted">
<div ng-messages-include="partials/templates/messages.tmpl.html"></div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
class="form-control"
type="text"
name="text"
placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_NAME' | translate }}..."
placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_NAME' | translate }}..."
required>
<div class="help-block" ng-messages="ActionForm.text.$error" ng-show="ActionForm.$submitted">
<div ng-messages-include="partials/templates/messages.tmpl.html"></div>
Expand Down
10 changes: 5 additions & 5 deletions client/src/partials/inventory/list/modals/actions.tmpl.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
class="form-control"
type="text"
name="code"
placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_CODE' | translate }}..."
placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_CODE' | translate }}..."
required>
<div class="help-block" ng-messages="ActionForm.code.$error" ng-show="ActionForm.$submitted">
<div ng-messages-include="partials/templates/messages.tmpl.html"></div>
Expand All @@ -28,7 +28,7 @@
class="form-control"
type="text"
name="text"
placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_NAME' | translate }}..."
placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_NAME' | translate }}..."
required>
<div class="help-block" ng-messages="ActionForm.text.$error" ng-show="ActionForm.$submitted">
<div ng-messages-include="partials/templates/messages.tmpl.html"></div>
Expand All @@ -49,7 +49,7 @@
<label class="control-label">{{ 'FORM.LABELS.PRICE' | translate }}</label>
<input class="form-control" type="text" name="price"
ng-model="$ctrl.session.price"
placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_PRICE' | translate }}..."
placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_PRICE' | translate }}..."
required>
<div class="help-block" ng-messages="ActionForm.price.$error" ng-show="ActionForm.$submitted">
<div ng-messages-include="partials/templates/messages.tmpl.html"></div>
Expand Down Expand Up @@ -108,14 +108,14 @@
<label class="control-label">{{ 'FORM.LABELS.UNIT_WEIGHT' | translate }}</label>
<input class="form-control" type="number" step="1" name="unit_weight"
ng-model="$ctrl.session.unit_weight"
placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_UNIT_WEIGHT' | translate }}...">
placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_UNIT_WEIGHT' | translate }}...">
</div>

<div class="form-group">
<label class="control-label">{{ 'FORM.LABELS.UNIT_VOLUME' | translate }}</label>
<input class="form-control" type="number" step="1" name="unit_volume"
ng-model="$ctrl.session.unit_volume"
placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_UNIT_VOLUME' | translate }}...">
placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_UNIT_VOLUME' | translate }}...">
</div>

</div>
Expand Down
4 changes: 2 additions & 2 deletions client/src/partials/locations/country/country.html
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ <h4>{{ 'FORM.INFOS.UPDATE_SUCCESS' | translate }} </h4>

<div class="form-group" ng-class="{ 'has-error' : CreateForm.$submitted && CreateForm.country.$invalid }">
<label class="control-label">{{ "FORM.LABELS.COUNTRY" | translate }}</label>
<input type="text" placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_COUNTRY' | translate }}" ng-maxlength="CountryCtrl.countryLength" class="form-control" name="country" ng-model="CountryCtrl.country.name" required>
<input type="text" placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_COUNTRY' | translate }}" ng-maxlength="CountryCtrl.countryLength" class="form-control" name="country" ng-model="CountryCtrl.country.name" required>
<div class="help-block" ng-messages="CreateForm.country.$error" ng-show="CreateForm.$submitted">
<div ng-messages-include="partials/templates/messages.tmpl.html"></div>
</div>
Expand All @@ -105,7 +105,7 @@ <h4>{{ 'FORM.INFOS.UPDATE_SUCCESS' | translate }} </h4>
<form class="panel-body" name="UpdateForm" ng-submit="CountryCtrl.submit(UpdateForm)" autocomplete="off" autocapitalize="off" autocorrect="off" novalidate>
<div class="form-group" ng-class="{ 'has-error' : UpdateForm.$submitted && UpdateForm.country.$invalid }">
<label class="control-label">{{ "FORM.LABELS.COUNTRY" | translate }}</label>
<input type="text" placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_COUNTRY' | translate }}" ng-maxlength="CountryCtrl.countryLength" class="form-control" name="country" ng-model="CountryCtrl.country.name" required>
<input type="text" placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_COUNTRY' | translate }}" ng-maxlength="CountryCtrl.countryLength" class="form-control" name="country" ng-model="CountryCtrl.country.name" required>
<div class="help-block" ng-messages="UpdateForm.country.$error" ng-show="UpdateForm.$submitted">
<div ng-messages-include="partials/templates/messages.tmpl.html"></div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions client/src/partials/locations/province/province.html
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ <h4>{{ 'FORM.INFOS.UPDATE_SUCCESS' | translate }} </h4>

<div class="form-group" ng-class="{ 'has-error' : CreateForm.$submitted && CreateForm.province.$invalid }">
<label class="control-label">{{ "FORM.LABELS.PROVINCE" | translate }}</label>
<input type="text" placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_PROVINCE' | translate }}" ng-maxlength="ProvinceCtrl.maxLength" class="form-control" name="province" ng-model="ProvinceCtrl.province.name" required>
<input type="text" placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_PROVINCE' | translate }}" ng-maxlength="ProvinceCtrl.maxLength" class="form-control" name="province" ng-model="ProvinceCtrl.province.name" required>
<div class="help-block" ng-messages="CreateForm.province.$error" ng-show="CreateForm.$submitted">
<div ng-messages-include="partials/templates/messages.tmpl.html"></div>
</div>
Expand Down Expand Up @@ -141,7 +141,7 @@ <h4>{{ 'FORM.INFOS.UPDATE_SUCCESS' | translate }} </h4>

<div class="form-group" ng-class="{ 'has-error' : UpdateForm.$submitted && UpdateForm.province.$invalid }">
<label class="control-label">{{ "FORM.LABELS.PROVINCE" | translate }}</label>
<input type="text" placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_PROVINCE' | translate }}" class="form-control" ng-maxlength="ProvinceCtrl.maxLength" name="province" ng-model="ProvinceCtrl.province.name" required>
<input type="text" placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_PROVINCE' | translate }}" class="form-control" ng-maxlength="ProvinceCtrl.maxLength" name="province" ng-model="ProvinceCtrl.province.name" required>
<div class="help-block" ng-messages="UpdateForm.province.$error" ng-show="UpdateForm.$submitted">
<div ng-messages-include="partials/templates/messages.tmpl.html"></div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions client/src/partials/locations/sector/sector.html
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ <h4>{{ 'FORM.INFOS.UPDATE_SUCCESS' | translate }} </h4>

<div class="form-group" ng-class="{ 'has-error' : CreateForm.$submitted && CreateForm.sector.$invalid }">
<label class="control-label">{{ "FORM.LABELS.SECTOR" | translate }}</label>
<input type="text" placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_SECTOR' | translate }}" ng-maxlength="SectorCtrl.maxLength" class="form-control" name="sector" ng-model="SectorCtrl.sector.name" required>
<input type="text" placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_SECTOR' | translate }}" ng-maxlength="SectorCtrl.maxLength" class="form-control" name="sector" ng-model="SectorCtrl.sector.name" required>
<div class="help-block" ng-messages="CreateForm.sector.$error" ng-show="CreateForm.$submitted">
<div ng-messages-include="partials/templates/messages.tmpl.html"></div>
</div>
Expand Down Expand Up @@ -174,7 +174,7 @@ <h4>{{ 'FORM.INFOS.UPDATE_SUCCESS' | translate }} </h4>

<div class="form-group" ng-class="{ 'has-error' : UpdateForm.$submitted && UpdateForm.sector.$invalid }">
<label class="control-label">{{ "FORM.LABELS.SECTOR" | translate }}</label>
<input type="text" placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_SECTOR' | translate }}" ng-maxlength="SectorCtrl.maxLength" class="form-control" name="sector" ng-model="SectorCtrl.sector.name" required>
<input type="text" placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_SECTOR' | translate }}" ng-maxlength="SectorCtrl.maxLength" class="form-control" name="sector" ng-model="SectorCtrl.sector.name" required>
<div class="help-block" ng-messages="UpdateForm.sector.$error" ng-show="UpdateForm.$submitted">
<div ng-messages-include="partials/templates/messages.tmpl.html"></div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions client/src/partials/locations/village/village.html
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ <h4>{{ 'FORM.INFOS.UPDATE_SUCCESS' | translate }} </h4>

<div class="form-group" ng-class="{ 'has-error' : CreateForm.$submitted && CreateForm.village.$invalid }">
<label class="control-label">{{ "FORM.LABELS.VILLAGE" | translate }}</label>
<input type="text" placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_VILLAGE' | translate }}" ng-maxlength="VillageCtrl.maxLength" class="form-control" name="village" ng-model="VillageCtrl.village.name" required>
<input type="text" placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_VILLAGE' | translate }}" ng-maxlength="VillageCtrl.maxLength" class="form-control" name="village" ng-model="VillageCtrl.village.name" required>
<div class="help-block" ng-messages="CreateForm.village.$error" ng-show="CreateForm.$submitted">
<div ng-messages-include="partials/templates/messages.tmpl.html"></div>
</div>
Expand Down Expand Up @@ -214,7 +214,7 @@ <h4>{{ 'FORM.INFOS.UPDATE_SUCCESS' | translate }} </h4>

<div class="form-group" ng-class="{ 'has-error' : UpdateForm.$submitted && UpdateForm.village.$invalid }">
<label class="control-label">{{ "FORM.LABELS.VILLAGE" | translate }}</label>
<input type="text" placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_VILLAGE' | translate }}" ng-maxlength="VillageCtrl.maxLength" class="form-control" name="village" ng-model="VillageCtrl.village.name" required>
<input type="text" placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_VILLAGE' | translate }}" ng-maxlength="VillageCtrl.maxLength" class="form-control" name="village" ng-model="VillageCtrl.village.name" required>
<div class="help-block" ng-messages="UpdateForm.village.$error" ng-show="UpdateForm.$submitted">
<div ng-messages-include="partials/templates/messages.tmpl.html"></div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions client/src/partials/login/login.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
type="text"
class="form-control"
ng-model="LoginCtrl.credentials.username"
placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_USERNAME' | translate }}"
placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_USERNAME' | translate }}"
autocomplete="off"
autocorrect="off"
autofocus
Expand All @@ -57,7 +57,7 @@
type="password"
ng-model="LoginCtrl.credentials.password"
class="form-control"
placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_PASSWORD' | translate }}"
placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_PASSWORD' | translate }}"
required />
</div>
</div>
Expand Down
Loading

0 comments on commit 66e7386

Please sign in to comment.