Fix time display emails #902
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
February 16, 2016 14:35
…lt time format and time zone. Also the time zone is shown.
| @@ -38,9 +38,13 @@ | |||
|
|
|||
| private final Optional<String> uiBaseUrl; | |||
| private final Optional<SMTPConfiguration> smtpConfiguration; | |||
| private String taskDatePattern; | |||
|
|
||
| @Inject | ||
| public MailTemplateHelpers(SandboxManager sandboxManager, SingularityConfiguration singularityConfiguration) { | ||
| taskDatePattern = singularityConfiguration.getDefaultDatePattern(); | ||
| timeZone = singularityConfiguration.getTimeZone(); |
There was a problem hiding this comment.
lets follow the format of the ones below with this.x = ...
| @@ -76,6 +77,8 @@ | |||
| @Min(value = 1, message = "Must be positive and non-zero") | |||
| private int defaultBounceExpirationMinutes = 60; | |||
|
|
|||
| private String mailerDatePattern = "MMM dd h:mm:ss a zzz"; | |||
There was a problem hiding this comment.
we should move these mailer* config fields into SMTPConfiguration
|
|
||
| import org.apache.commons.lang3.text.WordUtils; | ||
| import org.apache.commons.lang3.time.DateFormatUtils; | ||
| import org.apache.commons.lang3.tuple.Pair; |
There was a problem hiding this comment.
i dont think this import is necessary
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In pause emails, when an expiration time was set: