Skip to content
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

Merged
merged 3 commits into from
Aug 4, 2014
Merged

typo fix from transifex suggestion #10025

merged 3 commits into from
Aug 4, 2014

Conversation

vgezer
Copy link
Contributor

@vgezer vgezer commented Jul 29, 2014

@DeepDiver1975 - this is the fix for your email.

@MorrisJobke
Copy link
Contributor

👍

@MorrisJobke
Copy link
Contributor

Rebased to include the fixed tests from master

@ghost
Copy link

ghost commented Jul 30, 2014

🚀 Test Passed. 🚀
Refer to this link for build results: https://ci.owncloud.org/job/pull-request-analyser/6480/

@@ -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';
Copy link
Member

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

Copy link
Contributor Author

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.

@ghost
Copy link

ghost commented Aug 1, 2014

🚀 Test Passed. 🚀
Refer to this link for build results: https://ci.owncloud.org/job/pull-request-analyser/6506/

@MorrisJobke
Copy link
Contributor

I still like it 👍

@schiessle
Copy link
Contributor

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';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

expire date? 😉

@DeepDiver1975
Copy link
Member

Just as a side note to everybody:
expiration is American English
expiry is British English

we should use American English in the source code - British English is handled on transifex

expire is a verb not a noun

@DeepDiver1975
Copy link
Member

Would be good if someone could grep the code for expire @wakeup maybe? THX

@MorrisJobke
Copy link
Contributor

@DeepDiver1975 and for expiry ;)

@DeepDiver1975
Copy link
Member

@DeepDiver1975 and for expiry ;)

indeed

@vgezer
Copy link
Contributor Author

vgezer commented Aug 2, 2014

@MorrisJobke @DeepDiver1975 Found only in Mirall, but I did not check the comments, only the user-viewable strings ;)

@scrutinizer-notifier
Copy link

The inspection completed: No new issues

@ghost
Copy link

ghost commented Aug 2, 2014

🚀 Test Passed. 🚀
Refer to this link for build results: https://ci.owncloud.org/job/pull-request-analyser/6521/

@MorrisJobke
Copy link
Contributor

I still like it 👍

@DeepDiver1975
Copy link
Member

👍

DeepDiver1975 added a commit that referenced this pull request Aug 4, 2014
typo fix from transifex suggestion
@DeepDiver1975 DeepDiver1975 merged commit 65903a0 into master Aug 4, 2014
@DeepDiver1975 DeepDiver1975 deleted the l10n-typo branch August 4, 2014 09:03
@lock lock bot locked as resolved and limited conversation to collaborators Aug 16, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants