Skip to content

Fix i18n messages #1085

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.

Sign up for GitHub

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

Merged
asbiin merged 8 commits into from
Apr 1, 2018
Merged

Fix i18n messages #1085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4b9e70d
Fix gifts message
asbiin Mar 30, 2018
b91ab60
Use apostrophe
asbiin Mar 30, 2018
27872fb
Merge branch 'master' into fix-i18n-messages
asbiin Mar 30, 2018
d2ebf58
Update assets
asbiin Mar 30, 2018
3716bf9
Pluralize message
asbiin Mar 30, 2018
28b2532
Update assets
asbiin Mar 30, 2018
8d362b9
Fix duplicate message
asbiin Apr 1, 2018
2d42b28
Merge remote-tracking branch 'origin/master' into fix-i18n-messages
asbiin Apr 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion resources/lang/en/settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
'subscriptions_back' => 'Back to settings',
'subscriptions_upgrade_title' => 'Upgrade your account',
'subscriptions_upgrade_choose' => 'You picked the :plan plan.',
'subscriptions_upgrade_thanks' => 'We couldn\'t be happier. Enter your payment info below.',
'subscriptions_upgrade_infos' => 'We couldn\'t be happier. Enter your payment info below.',
'subscriptions_upgrade_name' => 'Name on card',
'subscriptions_upgrade_zip' => 'ZIP or postal code',
'subscriptions_upgrade_credit' => 'Credit or debit card',
Expand Down
2 changes: 1 addition & 1 deletion resources/views/settings/subscriptions/upgrade.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<div class="mt4 mw6 center mb4 pa2 pa0-ns">
<div class="br3 ba b--gray-monica bg-white pa4">
<h2 class="tc mt2 fw4">{{ trans('settings.subscriptions_upgrade_choose', ['plan' => $planInformation['type']]) }}</h2>
<p class="tc mb4">{{ trans('settings.subscriptions_upgrade_thanks') }}</p>
<p class="tc mb4">{{ trans('settings.subscriptions_upgrade_infos') }}</p>
<form action="/settings/subscriptions/processPayment" method="post" id="payment-form" class="mb4">
{{ csrf_field() }}

Expand Down