diff options
| author | cedricnjanga | 2018-04-12 06:33:32 -0700 | 
|---|---|---|
| committer | Johan Van Ryseghem | 2018-04-24 11:08:36 +0200 | 
| commit | eb51cf0aa62a96c552c1a32778aa84e64df458a6 (patch) | |
| tree | 92cc8cf466007b2ec78f293a25508666e510fe92 /app/javascript/vehicle_journeys | |
| parent | d85ec520859aae6a5bdc25ac1f11e00ded5f6266 (diff) | |
| download | chouette-core-eb51cf0aa62a96c552c1a32778aa84e64df458a6.tar.bz2 | |
Refs #6376 Add some english translations
Diffstat (limited to 'app/javascript/vehicle_journeys')
5 files changed, 7 insertions, 4 deletions
diff --git a/app/javascript/vehicle_journeys/components/Filters.js b/app/javascript/vehicle_journeys/components/Filters.js index 93fe015a8..1e43a490e 100644 --- a/app/javascript/vehicle_journeys/components/Filters.js +++ b/app/javascript/vehicle_journeys/components/Filters.js @@ -33,6 +33,7 @@ export default function Filters({filters, pagination, missions, onFilter, onRese              {/* Calendriers */}              <div className='form-group w33'>                <TimetableSelect2 +                placeholder={I18n.t('vehicle_journeys.vehicle_journeys_matrix.filters.timetable')}                  onSelect2Timetable={onSelect2Timetable}                  hasRoute={true}                  chunkURL={("/autocomplete_time_tables.json?route_id=" + String(window.route_id))} diff --git a/app/javascript/vehicle_journeys/components/tools/NotesEditVehicleJourney.js b/app/javascript/vehicle_journeys/components/tools/NotesEditVehicleJourney.js index 5d300f70c..ef58916f4 100644 --- a/app/javascript/vehicle_journeys/components/tools/NotesEditVehicleJourney.js +++ b/app/javascript/vehicle_journeys/components/tools/NotesEditVehicleJourney.js @@ -31,13 +31,13 @@ export default class NotesEditVehicleJourney extends Component {          type='button'          className='btn btn-outline-danger btn-xs'          onClick={() => this.props.onToggleFootnoteModal(lf, false)} -      ><span className="fa fa-trash"></span> Retirer</button> +      ><span className="fa fa-trash"></span>{I18n.t('actions.remove')}</button>      } else {        return <button          type='button'          className='btn btn-outline-primary btn-xs'          onClick={() => this.props.onToggleFootnoteModal(lf, true)} -      ><span className="fa fa-plus"></span> Ajouter</button> +      ><span className="fa fa-plus"></span>{I18n.t('actions.add')}</button>      }    } diff --git a/app/javascript/vehicle_journeys/components/tools/PurchaseWindowsEditVehicleJourney.js b/app/javascript/vehicle_journeys/components/tools/PurchaseWindowsEditVehicleJourney.js index 30c511302..5fc925f4c 100644 --- a/app/javascript/vehicle_journeys/components/tools/PurchaseWindowsEditVehicleJourney.js +++ b/app/javascript/vehicle_journeys/components/tools/PurchaseWindowsEditVehicleJourney.js @@ -44,7 +44,7 @@ export default class PurchaseWindowsEditVehicleJourney extends Component {                <div className='modal-dialog'>                  <div className='modal-content'>                    <div className='modal-header'> -                    <h4 className='modal-title'>{I18n.t('vehicle_journeys.form.purchase_windows')}s</h4> +                    <h4 className='modal-title'>{I18n.t('vehicle_journeys.form.purchase_windows')}</h4>                      <span type="button" className="close modal-close" data-dismiss="modal">×</span>                    </div> @@ -95,6 +95,7 @@ export default class PurchaseWindowsEditVehicleJourney extends Component {                                    <div className='wrapper'>                                      <div>                                        <TimetableSelect2 +                                        placeholder={I18n.t('vehicle_journeys.vehicle_journeys_matrix.filters.purchase_window')}                                          onSelect2Timetable={this.props.onSelect2Timetable}                                          chunkURL={'/autocomplete_purchase_windows.json'}                                          searchKey={"name_or_objectid_cont_any"} diff --git a/app/javascript/vehicle_journeys/components/tools/TimetablesEditVehicleJourney.js b/app/javascript/vehicle_journeys/components/tools/TimetablesEditVehicleJourney.js index 9ee2e1849..594140c76 100644 --- a/app/javascript/vehicle_journeys/components/tools/TimetablesEditVehicleJourney.js +++ b/app/javascript/vehicle_journeys/components/tools/TimetablesEditVehicleJourney.js @@ -97,6 +97,7 @@ export default class TimetablesEditVehicleJourney extends Component {                                    <div className='wrapper'>                                      <div>                                        <TimetableSelect2 +                                        placeholder={I18n.t('vehicle_journeys.vehicle_journeys_matrix.filters.timetable')}                                          onSelect2Timetable={this.props.onSelect2Timetable}                                          chunkURL={'/autocomplete_time_tables.json'}                                          searchKey={"unaccented_comment_or_objectid_cont_any"} diff --git a/app/javascript/vehicle_journeys/components/tools/select2s/TimetableSelect2.js b/app/javascript/vehicle_journeys/components/tools/select2s/TimetableSelect2.js index d5aad20d0..919853a71 100644 --- a/app/javascript/vehicle_journeys/components/tools/select2s/TimetableSelect2.js +++ b/app/javascript/vehicle_journeys/components/tools/select2s/TimetableSelect2.js @@ -26,7 +26,7 @@ export default class BSelect4 extends Component {            allowClear: false,            theme: 'bootstrap',            width: '100%', -          placeholder: I18n.t('vehicle_journeys.vehicle_journeys_matrix.filters.timetable'), +          placeholder: this.props.placeholder,            language: require('./language'),            ajax: {              url: origin + path + this.props.chunkURL,  | 
