This is an automated email from the git hooks/post-receive script. New commit to branch feature/sync in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git commit bf43b497525a2219527caeaf7521043d2393a194 Author: servantie <servantie.c@gmail.com> Date: Tue Jun 21 17:47:53 2016 +0200 corrected text on the checkbox isActiveSync --- src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java | 4 +++- .../chorem/jtimer/ui/report/resources/TimerTaskUpdaterView.properties | 4 ++-- .../jtimer/ui/report/resources/TimerTaskUpdaterView_fr.properties | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java b/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java index 7bc1787..e0be355 100644 --- a/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java +++ b/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java @@ -221,7 +221,7 @@ public class TimerTaskUpdaterView extends FrameView implements DocumentListener, lastUpdate = new JLabel(); //checkbox for active sync - checkIsActiveSync = new JCheckBox(getResourceMap().getString("isActiveSync")); + checkIsActiveSync = new JCheckBox(); checkIsActiveSync.setAction(getContext().getActionMap(this).get("isActiveSync")); if (urlComboBox.getSelectedItem() != null) { if (task.getSynchronizingURLList().contains(urlComboBox.getSelectedItem())){ @@ -230,6 +230,8 @@ public class TimerTaskUpdaterView extends FrameView implements DocumentListener, //if there has been an update before, display its date if ((lastSyncTime != null) && lastSyncTime.isAfter(LocalDateTime.MIN)) { lastUpdate.setText(lastSyncTime.toString()); + //logging change of lastSync + log.info(lastSyncTime.toString()); } checkIsActiveSync.setSelected(task.getSynchronizingInfo((String) urlComboBox.getSelectedItem()).getActiveSync()); } diff --git a/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView.properties b/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView.properties index 1e8718e..938b3ca 100644 --- a/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView.properties +++ b/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView.properties @@ -27,7 +27,6 @@ updateTo=To : lastUpdateLabel=Last Synchronization at: urlComboLabel = Synchronization Url: -isActiveSync = Active sync isNotActiveURL = Inactive Synchronization @@ -65,4 +64,5 @@ action.update404 = Not found action.update500 = Server error action.updateErrorTitle = Synchronization error action.updateEncodingError = Encoding error -action.updateURLError = URL error \ No newline at end of file +action.updateURLError = URL error +isActiveSync.Action.text = Active synchronization \ No newline at end of file diff --git a/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView_fr.properties b/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView_fr.properties index 0febdcb..722dc83 100644 --- a/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView_fr.properties +++ b/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView_fr.properties @@ -28,7 +28,6 @@ updateTo=\u00C0 : lastUpdateLabel=Derni\u00E8re synchronisation : urlComboLabel=Url de synchronisation : -isActiveSync= Synchronisation active isNotActiveURL = Synchronisation vers cette URL d\u00E9sactiv\u00E9e @@ -65,4 +64,5 @@ action.update400 = Mauvaise requ\u00EAte action.update404 = Mauvaise URL action.update500 = Erreur du serveur action.updateEncodingError = Erreur d'encodage -action.updateURLError = Erreur d'URL \ No newline at end of file +action.updateURLError = Erreur d'URL +isActiveSync.Action.text = Synchronisation Active \ No newline at end of file -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.