Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wolf2015-09-26 13:09:52 +0000
committerMatthias Sohn2015-10-04 22:04:58 +0000
commit76afd09ddd1e3e02c04830a10f01231a345af89e (patch)
tree7172fe9a260b9c0b4613c534a3de17e4d260ddda /org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
parentb7dbf41b711a87b2e25aecfadb1de5c7ac58d2bd (diff)
downloadegit-76afd09ddd1e3e02c04830a10f01231a345af89e.tar.gz
egit-76afd09ddd1e3e02c04830a10f01231a345af89e.tar.xz
egit-76afd09ddd1e3e02c04830a10f01231a345af89e.zip
Configurable date format used consistently throughout EGit
Part 1: UI and use it in history view. * New DateFormatPreferencePage. * New UI preferences. * New PreferenceBasedDateFormatter. * Changed uses of GitDateFormatter and DateFormat to use the new PreferenceBasedDateFormatter. Some implementation notes: * The default format is the custom format (already existing DATE_FORMAT preference. Reasons: this is a reasonable (local) format, and if the user had configured something there, it will still be used. Keep surprises for the user at a minimum. * PreferenceBasedDateFormatter is a subtype of GitDateFormatter to keep changes at a minimum. It also helps in the views where the user can explicitly force RELATIVE dates. * The old date format (under "Label Decorations/Other/DateFormat") preference UI has been removed. * Where we use label providers, make those listen to preference changes related to their labels (dates, showing e-mails), not the viewers. The label providers fire an event when their state changes, users can just listen on those events. Limits the proliferation of checking specific preferences, and simplifies some code. * Otherwise, views or viewers refresh on date format preference changes. * This commit also fixes - bug 339797 (custom format for date column in history view), - bug 477151 (preference page silently ignores incorrect date formats) Bug: 339797 Bug: 477151 Bug: 477248 Change-Id: Icede623ca753c1c830920f5ef2e6b629d4ceafb4 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties')
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties30
1 files changed, 27 insertions, 3 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
index ad757b8569..9fa22032d2 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
@@ -1037,6 +1037,33 @@ CommittingPreferencePage_WarnBlock_WarningsAndErrors=Warnings and errors
CommittingPreferencePage_BlockCommit=Block commit button
CommittingPreferencePage_BlockCommitCombo=Block if there are:
+DateFormatPreferencePage_title=Date Format
+DateFormatPreferencePage_formatChooser_label=Format
+DateFormatPreferencePage_formatInput_label=Date format
+DateFormatPreferencePage_invalidDateFormat_message=Not a valid date format
+DateFormatPreferencePage_datePreview_label=Date preview
+DateFormatPreferencePage_choiceGitDefault_label=Git default format
+DateFormatPreferencePage_choiceGitLocal_label=Git local format
+DateFormatPreferencePage_choiceGitRelative_label=Git relative date format
+DateFormatPreferencePage_choiceGitIso_label=Git ISO 8601 format
+DateFormatPreferencePage_choiceGitRfc_label=Git RFC 2822 format
+DateFormatPreferencePage_choiceGitShort_label=Git short date format
+DateFormatPreferencePage_choiceGitLocale_label=System locale date format with time zone
+DateFormatPreferencePage_choiceGitLocaleLocal_label=System locale date format
+DateFormatPreferencePage_choiceCustom_label=User-defined format
+DateFormatPreferencePage_gitRelative_format_text=relative date
+DateFormatPreferencePage_gitLocale_format_text=system format with time zone
+DateFormatPreferencePage_gitLocaleLocal_format_text=system format
+DateFormatPreferencePage_helpGitDefault_label=Time of the commit in the committer's time zone, with time zone; with US day and month names.
+DateFormatPreferencePage_helpGitLocal_label=Time of the commit converted to your local time zone, without time zone; with US day and month names.
+DateFormatPreferencePage_helpGitRelative_label=Time of the commit relative to your local time.
+DateFormatPreferencePage_helpGitIso_label=Time of the commit in the committer's time zone in ISO 8601 format with time zone.
+DateFormatPreferencePage_helpGitRfc_label=Time of the commit in the committer's time zone in e-mail format RFC 2822 with time zone.
+DateFormatPreferencePage_helpGitShort_label=Date of the commit in the committer's time zone, without time; year-month-day.
+DateFormatPreferencePage_helpGitLocale_label=Time of the commit in the committer's time zone in your system format, with time zone.
+DateFormatPreferencePage_helpGitLocaleLocal_label=Time of the commit converted to your local time zone in your system format, without time zone.
+DateFormatPreferencePage_helpCustom_label=Time of the commit in the committer's time zone in the format specified.
+
BasicConfigurationDialog_ConfigLocationInfo=These settings will be stored in the Git configuration file in your home directory.
BasicConfigurationDialog_DialogMessage=When creating a commit, Git records name and e-mail of author and committer. Please fill in the information so that your commits are correctly attributed.
BasicConfigurationDialog_DialogTitle=Please identify yourself
@@ -1169,9 +1196,6 @@ DecoratorPreferencesPage_iconsShowConflicts=Conflicting resources
DecoratorPreferencesPage_iconsShowAssumeValid=Assumed unchanged resources
DecoratorPreferencesPage_changeSetLabelFormat=Commits:
DecoratorPreferencesPage_otherDecorations=Other
-DecoratorPreferencesPage_dateFormat=Date format:
-DecoratorPreferencesPage_dateFormatPreview=Date preview:
-DecoratorPreferencesPage_wrongDateFormat=#Incorrect date format#
DecoratorPreferencesPage_bindingChangeSetAuthor=Commit author name;
DecoratorPreferencesPage_bindingChangeSetCommitter=Commit committer name;
DecoratorPreferencesPage_bindingChangeSetDate=Commit creation date (see date format setting);

Back to the top