From 1e6fa6fe8ede967f7116dbca507960d1f9153892 Mon Sep 17 00:00:00 2001
From: Benjamin Renard <brenard@easter-eggs.com>
Date: Wed, 9 Sep 2020 20:20:03 +0200
Subject: [PATCH] Improve samba config in LSexample

---
 src/conf/LSobjects/config.LSobjects.LSpeople.php | 16 ++++++----------
 src/lang/fr_FR.UTF8/lang.php                     | 16 +++++++++++-----
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/conf/LSobjects/config.LSobjects.LSpeople.php b/src/conf/LSobjects/config.LSobjects.LSpeople.php
index 22c91e0f..e96a9c70 100644
--- a/src/conf/LSobjects/config.LSobjects.LSpeople.php
+++ b/src/conf/LSobjects/config.LSobjects.LSpeople.php
@@ -827,10 +827,8 @@ $GLOBALS['LSobjects']['LSpeople'] = array (
       'html_options' => array(
         'time' => True,
         'showTodayButton' => False,
-        'special_values' => array(
-          '0' => 'Never',
-        ),
       ),
+      'no_value_label' => 'Never',
       'rights' => array(
         'admin' => 'w'
       ),
@@ -852,10 +850,8 @@ $GLOBALS['LSobjects']['LSpeople'] = array (
       'html_options' => array(
         'time' => True,
         'showTodayButton' => False,
-        'special_values' => array(
-          '0' => 'Never',
-        ),
       ),
+      'no_value_label' => 'Never',
       'rights' => array(
         'admin' => 'w'
       ),
@@ -882,7 +878,7 @@ $GLOBALS['LSobjects']['LSpeople'] = array (
           LS_SAMBA_INFINITY_TIME => 'Never',
         ),
       ),
-      'no_value_label' => 'Never',
+      'no_value_label' => 'Default (never)',
       'rights' => array(
         'admin' => 'w'
       ),
@@ -959,13 +955,13 @@ $GLOBALS['LSobjects']['LSpeople'] = array (
           LS_SAMBA_INFINITY_TIME => 'Never',
         ),
       ),
-      'no_value_label' => 'Never',
+      'no_value_label' => 'Default (never)',
       'rights' => array(
         'admin' => 'w'
       ),
       'view' => 1,
       'form' => array (
-        'modify' => 0
+        'modify' => 1
       )
     ),
     /* ----------- end -----------*/
@@ -987,7 +983,7 @@ $GLOBALS['LSobjects']['LSpeople'] = array (
           0 => 'Whenever',
         ),
       ),
-      'no_value_label' => 'Whenever',
+      'no_value_label' => 'Default (whenever)',
       'multiple' => true,
       'rights' => array(
         'admin' => 'w'
diff --git a/src/lang/fr_FR.UTF8/lang.php b/src/lang/fr_FR.UTF8/lang.php
index cecb1196..f9e9af2f 100644
--- a/src/lang/fr_FR.UTF8/lang.php
+++ b/src/lang/fr_FR.UTF8/lang.php
@@ -42,6 +42,15 @@ $GLOBALS['LSlang'] = array (
 "Company" =>
   "Société",
 
+# LSobjects.LSpeople.attrs.sambaKickoffTime.no_value_label
+# LSobjects.LSpeople.attrs.sambaPwdMustChange.no_value_label
+"Default (never)" =>
+  "Par défaut (jamais)",
+
+# LSobjects.LSpeople.attrs.sambaPwdCanChange.no_value_label
+"Default (whenever)" =>
+  "Par défaut (n'importe quand)",
+
 # LSobjects.LSpeople.attrs.description.label
 # LSobjects.LSgroup.attrs.description.label
 # LSobjects.LSsysaccount.attrs.description.label
@@ -183,12 +192,10 @@ $GLOBALS['LSlang'] = array (
 "Nb / page :" =>
   "Nb / page :",
 
-# LSobjects.LSpeople.attrs.sambaLogonTime.html_options.special_values.0
-# LSobjects.LSpeople.attrs.sambaLogoffTime.html_options.special_values.0
-# LSobjects.LSpeople.attrs.sambaKickoffTime.no_value_label
+# LSobjects.LSpeople.attrs.sambaLogonTime.no_value_label
+# LSobjects.LSpeople.attrs.sambaLogoffTime.no_value_label
 # LSobjects.LSpeople.attrs.sambaKickoffTime.html_options.special_values.2147483647
 # LSobjects.LSpeople.attrs.sambaPwdLastSet.no_value_label
-# LSobjects.LSpeople.attrs.sambaPwdMustChange.no_value_label
 # LSobjects.LSpeople.attrs.sambaPwdMustChange.html_options.special_values.2147483647
 # LSobjects.LSpeople.attrs.sambaPwdCanChange.html_options.special_values.2147483647
 "Never" =>
@@ -335,7 +342,6 @@ $GLOBALS['LSlang'] = array (
 "Users" =>
   "Utilisateurs",
 
-# LSobjects.LSpeople.attrs.sambaPwdCanChange.no_value_label
 # LSobjects.LSpeople.attrs.sambaPwdCanChange.html_options.special_values.0
 "Whenever" =>
   "N'importe quand",