-
Notifications
You must be signed in to change notification settings - Fork 2.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
typo fix from transifex suggestion #10025
Conversation
👍 |
Rebased to include the fixed tests from master |
🚀 Test Passed. 🚀 |
@@ -955,8 +955,8 @@ private static function validateExpireDate($expireDate, $shareTime, $itemType, $ | |||
$maxDays = \OCP\Config::getAppValue('core', 'shareapi_expire_after_n_days', '7'); | |||
$maxDate->add(new \DateInterval('P' . $maxDays . 'D')); | |||
if ($date > $maxDate) { | |||
$warning = 'Can not set expire date. Shares can not expire later then ' . $maxDays . ' after they where shared'; | |||
$warning_t = $l->t('Can not set expire date. Shares can not expire later then %s after they where shared', array($maxDays)); | |||
$warning = 'Can not set expire date. Shares can not expire later than ' . $maxDays . ' after they where shared'; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should be 'Cannot' and there is no expire date - it's either expiry date or expiration date
@schiesbn @MTRichards
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, actually a native speaker was always suggesting using "cannot" in those cases :). Also I haven't noticed the expiry date. will fix now.
🚀 Test Passed. 🚀 |
I still like it 👍 |
looks good! 👍 |
\OCP\Util::writeLog('OCP\Share', $warning, \OCP\Util::WARN); | ||
throw new \Exception($warning_t); | ||
} | ||
} | ||
|
||
if ($date < $today) { | ||
$message = 'Can not set expire date. Expire date is in the past'; | ||
$message_t = $l->t('Can not set expire date. Expire date is in the past'); | ||
$message = 'Cannot set expiration date. Expire date is in the past'; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
expire date? 😉
Just as a side note to everybody: we should use American English in the source code - British English is handled on transifex expire is a verb not a noun |
Would be good if someone could grep the code for expire @wakeup maybe? THX |
@DeepDiver1975 and for expiry ;) |
indeed |
@MorrisJobke @DeepDiver1975 Found only in Mirall, but I did not check the comments, only the user-viewable strings ;) |
The inspection completed: No new issues |
🚀 Test Passed. 🚀 |
I still like it 👍 |
👍 |
typo fix from transifex suggestion
@DeepDiver1975 - this is the fix for your email.