Browse Source

Calendrier en français

prodstable
Guillaume 3 years ago
parent
commit
e12ee0ca2a
4 changed files with 6 additions and 4 deletions
  1. +1
    -0
      backend/views/layouts/main.php
  2. +2
    -1
      producer/views/layouts/main.php
  3. +2
    -2
      producer/views/order/order.php
  4. +1
    -1
      producer/web/js/vuejs/order-order.js

+ 1
- 0
backend/views/layouts/main.php View File

@@ -95,6 +95,7 @@ if (Yii::$app->controller->action->id === 'login') {

</div>

<script type="text/javascript" src="https://cdn.polyfill.io/v3/polyfill.min.js?features=Intl.~locale.fr"></script>
<?php $this->endBody() ?>
<?= $this->render('@common/views/_analytics.php'); ?>


+ 2
- 1
producer/views/layouts/main.php View File

@@ -56,6 +56,7 @@ if (!Yii::$app->user->isGuest) {
?>
<?php $this->beginPage() ?>
<!DOCTYPE html>
<html lang="fr-FR">
<head>
<title><?= Html::encode($producer->name); ?> | <?= $this->getPageTitle(); ?></title>
<meta charset="utf-8">
@@ -331,7 +332,7 @@ if (!Yii::$app->user->isGuest) {
src="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/logo-diaspora.png" alt="Diaspora"/></a>
</div>
</footer>
<script type="text/javascript" src="https://cdn.polyfill.io/v3/polyfill.min.js?features=Intl.~locale.fr"></script>
<?php $this->endBody() ?>
<?= $this->render('@common/views/_analytics.php'); ?>
</body>

+ 2
- 2
producer/views/order/order.php View File

@@ -147,8 +147,8 @@ $producer = GlobalParam::getCurrentProducer() ;
is-expanded
v-model="date"
mode="single"
locale="fr"
:locale="{id: 'fr', firstDayOfWeek: 2, masks: { weekdays: 'WW' }}"
locale="fr-FR"
:locale="{ id: 'fr_FR', firstDayOfWeek: 1, masks: { weekdays: 'WW' } }"
:formats="calendar.formats"
:theme-styles="calendar.themeStyles"
:attributes="calendar.attrs"

+ 1
- 1
producer/web/js/vuejs/order-order.js View File

@@ -1,4 +1,5 @@


var app = new Vue({
el: '#app-order-order',
data() {
@@ -66,7 +67,6 @@ var app = new Vue({
}, window.appInitValues);
},
mounted: function() {

var dateDefined = $('#order-distribution-date').size() || $('#distribution-date').size() ;

if(dateDefined) {

Loading…
Cancel
Save