Skip to content

Commit

Permalink
chore(HR): correct HR spelling in dictionary.
Browse files Browse the repository at this point in the history
Corrects the spelling of "Human Resources" throughout the application.
  • Loading branch information
jniles committed Jan 1, 2025
1 parent 4816085 commit cd1a9d8
Show file tree
Hide file tree
Showing 45 changed files with 57 additions and 53 deletions.
2 changes: 1 addition & 1 deletion client/src/i18n/en/tree.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
"GRADES" : "Grade Management",
"HOLIDAYS_MANAGEMENT" : "Holidays Management",
"HOSPITAL" : "Hospital",
"HUMANS_RESSOURCES" : "Human Resources",
"HUMAN_RESOURCES" : "Human Resources",
"IMPORT_STOCK_FROM_FILE":"Stock Import",
"INDEXES" : "Indexes",
"INDICATORS" : "Indicators",
Expand Down
2 changes: 1 addition & 1 deletion client/src/i18n/fr/tree.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
"GRADE_EMPLOYERS":"Gestion Grades",
"HOLIDAYS_MANAGEMENT" : "Gestion des Vacances",
"HOSPITAL":"Hôpital",
"HUMANS_RESSOURCES":"Ressources humaines",
"HUMAN_RESOURCES":"Ressources humaines",
"IMPORT_STOCK_FROM_FILE":"Importation de stock",
"INDEXES" : "Indices",
"INDICATORS" : "Indicateurs",
Expand Down
2 changes: 1 addition & 1 deletion client/src/modules/employees/registration/employees.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="flex-header">
<div class="bhima-title">
<ol class="headercrumb">
<li class="static" translate>TREE.HUMANS_RESSOURCES</li>
<li class="static" translate>TREE.HUMAN_RESOURCES</li>
<li class="title" translate>EMPLOYEE.TITLE</li>
<li ng-if="EmployeeCtrl.isUpdating" class="title">{{ EmployeeCtrl.employee.name }}</li>
</ol>
Expand Down
2 changes: 1 addition & 1 deletion client/src/modules/employees/registry/registry.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="flex-header">
<div class="bhima-title">
<ol class="headercrumb">
<li class="static" translate>TREE.HUMANS_RESSOURCES</li>
<li class="static" translate>TREE.HUMAN_RESOURCES</li>
<li class="title" translate>EMPLOYEE_REGISTRY.TITLE</li>
</ol>

Expand Down
2 changes: 1 addition & 1 deletion client/src/modules/functions/functions.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="flex-header">
<div class="bhima-title">
<ol class="headercrumb">
<li class="static" translate>TREE.HUMANS_RESSOURCES</li>
<li class="static" translate>TREE.HUMAN_RESOURCES</li>
<li class="title" translate>TREE.PROFESSION</li>
</ol>

Expand Down
2 changes: 1 addition & 1 deletion client/src/modules/functions/modals/function.modal.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<div class="modal-header">
<ol class="headercrumb">
<li class="static" translate>TREE.HUMANS_RESSOURCES</li>
<li class="static" translate>TREE.HUMAN_RESOURCES</li>
<li class="static" translate>TREE.PROFESSION</li>
<li ng-if="FunctionModalCtrl.isCreateState" class="title">
<span translate>FORM.INFO.ADD_FUNCTION</span>
Expand Down
2 changes: 1 addition & 1 deletion client/src/modules/grades/grades.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="flex-header">
<div class="bhima-title">
<ol class="headercrumb">
<li class="static" translate>TREE.HUMANS_RESSOURCES</li>
<li class="static" translate>TREE.HUMAN_RESOURCES</li>
<li class="title" translate>GRADE.TITLE</li>
</ol>

Expand Down
2 changes: 1 addition & 1 deletion client/src/modules/grades/modals/grade.modal.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<form name="GradeForm" bh-submit="GradeModalCtrl.submit(GradeForm)" novalidate>
<div class="modal-header">
<ol class="headercrumb">
<li class="static" translate>TREE.HUMANS_RESSOURCES</li>
<li class="static" translate>TREE.HUMAN_RESOURCES</li>
<li class="static" translate>GRADE.TITLE</li>
<li ng-if="GradeModalCtrl.isCreateState" class="title">
<span translate>GRADE.ADD_GRADE</span>
Expand Down
2 changes: 1 addition & 1 deletion client/src/modules/holidays/holidays.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="flex-header">
<div class="bhima-title">
<ol class="headercrumb">
<li class="static" translate>TREE.HUMANS_RESSOURCES</li>
<li class="static" translate>TREE.HUMAN_RESOURCES</li>
<li class="title" translate> HOLIDAY.TITLE </li>
</ol>

Expand Down
2 changes: 1 addition & 1 deletion client/src/modules/holidays/modals/holiday.modal.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<form name="HolidayForm" bh-submit="HolidayModalCtrl.submit(HolidayForm)" novalidate>
<div class="modal-header">
<ol class="headercrumb">
<li class="static" translate>TREE.HUMANS_RESSOURCES</li>
<li class="static" translate>TREE.HUMAN_RESOURCES</li>
<li class="static" translate>HOLIDAY.TITLE</li>
<li ng-if="HolidayModalCtrl.isCreateState" class="title">
<span translate>HOLIDAY.ADD_HOLIDAY</span>
Expand Down
2 changes: 1 addition & 1 deletion client/src/modules/ipr_tax/configuration/iprTaxConfig.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="flex-header">
<div class="bhima-title">
<ol class="headercrumb">
<li class="static" translate>TREE.HUMANS_RESSOURCES</li>
<li class="static" translate>TREE.HUMAN_RESOURCES</li>
<li class="title" translate> IPRTAX.CONFIG </li>
</ol>

Expand Down
2 changes: 1 addition & 1 deletion client/src/modules/ipr_tax/ipr_tax.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="flex-header">
<div class="bhima-title">
<ol class="headercrumb">
<li class="static" translate>TREE.HUMANS_RESSOURCES</li>
<li class="static" translate>TREE.HUMAN_RESOURCES</li>
<li class="title" translate>IPRTAX.TITLE</li>
</ol>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<form name="ConfigPaiementForm" bh-submit="ConfigPaiementModalCtrl.submit(ConfigPaiementForm)" novalidate>
<div class="modal-header">
<ol class="headercrumb">
<li class="static" translate>TREE.HUMANS_RESSOURCES</li>
<li class="static" translate>TREE.HUMAN_RESOURCES</li>
<li class="title" translate>TREE.MULTI_PAYROLL</li>
<label class="badge badge-success">{{ ConfigPaiementModalCtrl.employee.display_name }}</label>
<label class="badge badge-primary"><span translate> {{ ConfigPaiementModalCtrl.label }} </span> : {{ ConfigPaiementModalCtrl.displayValue }}</label>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<form name="ModalForm" bh-submit="$ctrl.submit(ModalForm)" novalidate>
<div class="modal-header">
<ol class="headercrumb">
<li class="static" translate>TREE.HUMANS_RESSOURCES</li>
<li class="static" translate>TREE.HUMAN_RESOURCES</li>
<li class="title" translate>TREE.MULTI_PAYROLL</li>
</ol>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<form name="ModalForm" bh-submit="ModalCtrl.submit(ModalForm)" novalidate>
<div class="modal-header">
<ol class="headercrumb">
<li class="static" translate>TREE.HUMANS_RESSOURCES</li>
<li class="static" translate>TREE.HUMAN_RESOURCES</li>
<li class="static" translate>FORM.BUTTONS.PUT_ON_WAITING</li>
</ol>
</div>
Expand Down
2 changes: 1 addition & 1 deletion client/src/modules/multiple_payroll/multiple_payroll.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="flex-header">
<div class="bhima-title">
<ol class="headercrumb">
<li class="static" translate>TREE.HUMANS_RESSOURCES</li>
<li class="static" translate>TREE.HUMAN_RESOURCES</li>
<li class="title" translate>TREE.MULTI_PAYROLL</li>
</ol>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<form name="ConfigPaiementForm" bh-submit="ConfigPaiementModalCtrl.submit(ConfigPaiementForm)" novalidate>
<div class="modal-header">
<ol class="headercrumb">
<li class="static" translate>TREE.HUMANS_RESSOURCES</li>
<li class="static" translate>TREE.HUMAN_RESOURCES</li>
<li class="static" translate>TREE.INDEXES</li>
<li class="title" translate>TREE.MULTI_PAYROLL</li>
<label class="badge badge-success">{{ ConfigPaiementModalCtrl.employee.display_name }}</label>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<form name="ModalForm" bh-submit="$ctrl.submit(ModalForm)" novalidate>
<div class="modal-header">
<ol class="headercrumb">
<li class="static" translate>TREE.HUMANS_RESSOURCES</li>
<li class="static" translate>TREE.HUMAN_RESOURCES</li>
<li class="static" translate>TREE.INDEXES</li>
<li class="static" translate>TREE.MULTI_PAYROLL_INDICE</li>
<li class="title" translate>FORM.INFO.IMPORT_PAYROLL_CONFIGURATION</li>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<form name="ModalForm" bh-submit="$ctrl.submit(ModalForm)" novalidate>
<div class="modal-header">
<ol class="headercrumb">
<li class="static" translate>TREE.HUMANS_RESSOURCES</li>
<li class="static" translate>TREE.HUMAN_RESOURCES</li>
<li class="static" translate>TREE.INDEXES</li>
<li class="static" translate>FORM.LABELS.SETTINGS</li>
<li class="title" translate>TREE.MULTI_PAYROLL_INDICE</li>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<form name="ModalForm" bh-submit="$ctrl.submit(ModalForm)" novalidate>
<div class="modal-header">
<ol class="headercrumb">
<li class="static" translate>TREE.HUMANS_RESSOURCES</li>
<li class="static" translate>TREE.HUMAN_RESOURCES</li>
<li class="static" translate>TREE.INDEXES</li>
<li class="title" translate>TREE.MULTI_PAYROLL</li>
</ol>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="flex-header">
<div class="bhima-title">
<ol class="headercrumb">
<li class="static" translate>TREE.HUMANS_RESSOURCES</li>
<li class="static" translate>TREE.HUMAN_RESOURCES</li>
<li class="static" translate>TREE.INDEXES</li>
<li class="title" translate>TREE.MULTI_PAYROLL_INDICE</li>
</ol>
Expand Down
2 changes: 1 addition & 1 deletion client/src/modules/offdays/offdays.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="flex-header">
<div class="bhima-title">
<ol class="headercrumb">
<li class="static" translate>TREE.HUMANS_RESSOURCES</li>
<li class="static" translate>TREE.HUMAN_RESOURCES</li>
<li class="title" translate> OFFDAY.TITLE </li>
</ol>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="flex-header">
<div class="bhima-title">
<ol class="headercrumb">
<li class="static" translate>TREE.HUMANS_RESSOURCES</li>
<li class="static" translate>TREE.HUMAN_RESOURCES</li>
<li class="title" translate> TREE.PAYROLL_ACCOUNT_CONFIGURATION </li>
</ol>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<form name="AccountConfigForm" bh-submit="AccountConfigModalCtrl.submit(AccountConfigForm)" novalidate>
<div class="modal-header">
<ol class="headercrumb">
<li class="static" translate>TREE.HUMANS_RESSOURCES</li>
<li class="static" translate>TREE.HUMAN_RESOURCES</li>
<li ng-if="AccountConfigModalCtrl.isCreateState" class="title">
<span translate>TREE.PAYROLL_ACCOUNT_CONFIGURATION</span>
<label class="badge badge-success" translate>FORM.LABELS.CREATE</label>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="flex-header">
<div class="bhima-title">
<ol class="headercrumb">
<li class="static" translate>TREE.HUMANS_RESSOURCES</li>
<li class="static" translate>TREE.HUMAN_RESOURCES</li>
<li class="title" translate> TREE.PAYROLL_EMP_CONFIGURATION </li>
</ol>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<form name="EmployeeForm" bh-submit="EmployeeModalCtrl.submit(EmployeeForm)" novalidate>
<div class="modal-header">
<ol class="headercrumb">
<li class="static" translate>TREE.HUMANS_RESSOURCES</li>
<li class="static" translate>TREE.HUMAN_RESOURCES</li>
<li class="title">
<span translate>TREE.PAYROLL_EMP_CONFIGURATION</span>
<label ng-show="EmployeeModalCtrl.isCreateState" class="badge badge-success" translate>FORM.LABELS.CREATE</label>
Expand Down
2 changes: 1 addition & 1 deletion client/src/modules/payroll/modals/payroll.modal.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<form name="PayrollModalForm" bh-submit="PayrollConfigModalCtrl.submit(PayrollModalForm)" novalidate>
<div class="modal-header">
<ol class="headercrumb">
<li class="static" translate>TREE.HUMANS_RESSOURCES</li>
<li class="static" translate>TREE.HUMAN_RESOURCES</li>
<li class="title">
<span translate>TREE.PAYROLL_CONFIGURATION</span>
<label ng-if="PayrollConfigModalCtrl.isCreateState" class="badge badge-success" translate>FORM.LABELS.CREATE</label>
Expand Down
2 changes: 1 addition & 1 deletion client/src/modules/payroll/payroll.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="flex-header">
<div class="bhima-title">
<ol class="headercrumb">
<li class="static" translate>TREE.HUMANS_RESSOURCES</li>
<li class="static" translate>TREE.HUMAN_RESOURCES</li>
<li class="title" translate> TREE.PAYROLL_CONFIGURATION </li>
</ol>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="flex-header">
<div class="bhima-title">
<ol class="headercrumb">
<li class="static" translate>TREE.HUMANS_RESSOURCES</li>
<li class="static" translate>TREE.HUMAN_RESOURCES</li>
<li class="title" translate> PAYROLL_RUBRIC.CONFIGURATION </li>
</ol>

Expand Down
17 changes: 7 additions & 10 deletions client/src/modules/payroll/rubric_configuration/configuration.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,16 @@ angular.module('bhima.controllers')
.controller('ConfigurationController', ConfigurationController);

ConfigurationController.$inject = [
'ConfigurationService', 'ModalService',
'NotifyService', 'uiGridConstants', '$state', 'SessionService',
'ConfigurationService', 'ModalService', 'NotifyService', 'uiGridConstants',
];

/**
* Rubric Management Controller
* Rubric Configuration Controller
*
* This controller is about the Rubric management module in the admin zone
* It's responsible for creating, editing and updating a Rubric
* This controller is about the rubric configuration module in the admin zone
* It is responsible for creating, updating, and deleting rubric configurations.
*/
function ConfigurationController(Configs, ModalService,
Notify, uiGridConstants, $state, Session) {
function ConfigurationController(Configs, ModalService, Notify, uiGridConstants) {
const vm = this;

const gridColumn = [
Expand All @@ -31,7 +29,6 @@ function ConfigurationController(Configs, ModalService,
// bind methods
vm.deleteConfig = deleteConfig;
vm.toggleFilter = toggleFilter;
vm.currencySymbol = Session.enterprise.currencySymbol;

// global variables
vm.gridApi = {};
Expand Down Expand Up @@ -72,11 +69,11 @@ function ConfigurationController(Configs, ModalService,
}

// switch to delete warning mode
function deleteConfig(title) {
function deleteConfig(rubric) {
ModalService.confirm('FORM.DIALOGS.CONFIRM_DELETE')
.then((bool) => {
if (!bool) { return 0; }
return Configs.delete(title.id);
return Configs.delete(rubric.id);
})
.then(() => {
Notify.success('FORM.INFO.DELETE_SUCCESS');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<form name="RubricForm" bh-submit="RubricConfigModalCtrl.submit(RubricForm)" novalidate>
<div class="modal-header">
<ol class="headercrumb">
<li class="static" translate>TREE.HUMANS_RESSOURCES</li>
<li class="static" translate>TREE.HUMAN_RESOURCES</li>
<li class="title">
<span translate>PAYROLL_RUBRIC.CONFIGURATION</span>
<label class="badge badge-success">{{ RubricConfigModalCtrl.config.label }}</label>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<form name="RubricForm" bh-submit="ConfigModalCtrl.submit(RubricForm)" novalidate>
<div class="modal-header">
<ol class="headercrumb">
<li class="static" translate>TREE.HUMANS_RESSOURCES</li>
<li class="static" translate>TREE.HUMAN_RESOURCES</li>
<li ng-if="ConfigModalCtrl.isCreating" class="title">
<span translate>PAYROLL_RUBRIC.ADD_PAYROLL_RUBRIC_CONFIGURATION</span>
<label class="badge badge-success" translate>FORM.LABELS.CREATE</label>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<form name="RubricForm" bh-submit="RubricModalCtrl.submit(RubricForm)" novalidate>
<div class="modal-header">
<ol class="headercrumb">
<li class="static" translate>TREE.HUMANS_RESSOURCES</li>
<li class="static" translate>TREE.HUMAN_RESOURCES</li>
<li ng-if="RubricModalCtrl.isCreateState" class="title">
<span translate>PAYROLL_RUBRIC.ADD_PAYROLL_RUBRIC</span>
<label class="badge badge-success" translate>FORM.LABELS.CREATE</label>
Expand Down
2 changes: 1 addition & 1 deletion client/src/modules/payroll/rubrics/rubrics.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="flex-header">
<div class="bhima-title">
<ol class="headercrumb">
<li class="static" translate>TREE.HUMANS_RESSOURCES</li>
<li class="static" translate>TREE.HUMAN_RESOURCES</li>
<li class="title" translate> PAYROLL_RUBRIC.TITLE </li>
</ol>

Expand Down
2 changes: 1 addition & 1 deletion client/src/modules/payroll/settings/settings.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="flex-header">
<div class="bhima-title">
<ol class="headercrumb">
<li class="static" translate>TREE.HUMANS_RESSOURCES</li>
<li class="static" translate>TREE.HUMAN_RESOURCES</li>
<li class="title" translate>TREE.PAYROLL_SETTINGS</li>
</ol>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<form name="staffingindiceFom" bh-submit="$ctrl.submit(staffingindiceFom)" novalidate>
<div class="modal-header">
<ol class="headercrumb">
<li class="static" translate>TREE.HUMANS_RESSOURCES</li>
<li class="static" translate>TREE.HUMAN_RESOURCES</li>
<li class="static" translate>TREE.INDEXES</li>
<li>
<span translate>TREE.STAFFING_INDICES_MANAGEMENT</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="modal-header">
<ol class="headercrumb">
<li>
<li class="static" translate>TREE.HUMANS_RESSOURCES</li>
<li class="static" translate>TREE.HUMAN_RESOURCES</li>
<li class="static" translate>TREE.INDEXES</li>
<span translate>TREE.STAFFING_INDICES_MANAGEMENT</span>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="modal-header">
<ol class="headercrumb">
<li>
<li class="static" translate>TREE.HUMANS_RESSOURCES</li>
<li class="static" translate>TREE.HUMAN_RESOURCES</li>
<li class="static" translate>TREE.INDEXES</li>
<span translate>TREE.STAFFING_INDICES_MANAGEMENT</span>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<div class="modal-header">
<ol class="headercrumb">
<li class="static" translate>TREE.HUMANS_RESSOURCES</li>
<li class="static" translate>TREE.HUMAN_RESOURCES</li>
<li class="static" translate>TREE.INDEXES</li>
<li class="static" translate> TREE.STAFFING_INDICES_MANAGEMENT</li>
<li class="title" translate> FORM.INFO.SEARCH </li>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="flex-header">
<div class="bhima-title">
<ol class="headercrumb">
<li class="static" translate>TREE.HUMANS_RESSOURCES</li>
<li class="static" translate>TREE.HUMAN_RESOURCES</li>
<li class="static" translate>TREE.INDEXES</li>
<li class="title" translate>TREE.STAFFING_INDICES_MANAGEMENT</li>
</ol>
Expand Down
Loading

0 comments on commit cd1a9d8

Please sign in to comment.