Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-04 02:07:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for lang conflict

Browse Source
This commit is contained in:
David Bomba 2021-04-29 12:31:49 +10:00
commit 1d49f1fe21
5 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Constants.php
View File

@ -361,7 +361,7 @@ if (! defined('APP_NAME')) {
define('NINJA_APP_URL', env('NINJA_APP_URL', 'https://app.invoiceninja.com')); define('NINJA_APP_URL', env('NINJA_APP_URL', 'https://app.invoiceninja.com'));
define('NINJA_DOCS_URL', env('NINJA_DOCS_URL', 'https://invoice-ninja.readthedocs.io/en/latest')); define('NINJA_DOCS_URL', env('NINJA_DOCS_URL', 'https://invoice-ninja.readthedocs.io/en/latest'));
define('NINJA_DATE', '2000-01-01'); define('NINJA_DATE', '2000-01-01');
define('NINJA_VERSION', '4.5.37' . env('NINJA_VERSION_SUFFIX')); define('NINJA_VERSION', '4.5.38' . env('NINJA_VERSION_SUFFIX'));
define('NINJA_TERMS_VERSION', '1.0.1'); define('NINJA_TERMS_VERSION', '1.0.1');
define('SOCIAL_LINK_FACEBOOK', env('SOCIAL_LINK_FACEBOOK', 'https://www.facebook.com/invoiceninja')); define('SOCIAL_LINK_FACEBOOK', env('SOCIAL_LINK_FACEBOOK', 'https://www.facebook.com/invoiceninja'));

5
app/Models/User.php
View File

@ -496,11 +496,6 @@ class User extends Authenticatable
public function eligibleForMigration() public function eligibleForMigration()
{ {
// Not ready to show to hosted users
if (Utils::isNinjaProd()) {
return false;
}
return is_null($this->public_id) || $this->public_id == 0; return is_null($this->public_id) || $this->public_id == 0;
} }
} }

2
docs/conf.py
View File

@ -59,7 +59,7 @@ author = u'Invoice Ninja'
# The short X.Y version. # The short X.Y version.
version = u'4.5' version = u'4.5'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = u'4.5.37' release = u'4.5.38'
# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.

12
resources/lang/en/texts.php
View File

@ -4271,7 +4271,17 @@ $LANG = array(
'activity_82' => ':user archived subscription :subscription', 'activity_82' => ':user archived subscription :subscription',
'activity_83' => ':user deleted subscription :subscription', 'activity_83' => ':user deleted subscription :subscription',
'activity_84' => ':user restored subscription :subscription', 'activity_84' => ':user restored subscription :subscription',
'lang_Russian' => 'Russian',
'amount_greater_than_balance_v5' => 'The amount is greater than the invoice balance. You cannot overpay an invoice.',
'click_to_continue' => 'Click to continue',
'notification_invoice_created_subject' => 'Invoice :invoice was created to :client',
'notification_invoice_created_subject' => 'Invoice :invoice was created for :client',
'notification_quote_created_subject' => 'Quote :invoice was created to :client',
'notification_quote_created_subject' => 'Quote :invoice was created for :client',
'notification_credit_created_subject' => 'Credit :invoice was created to :client',
'notification_credit_created_subject' => 'Credit :invoice was created for :client',
); );
return $LANG; return $LANG;

38
resources/views/accounts/management.blade.php
View File

@ -238,27 +238,29 @@
</div> </div>
</div> </div>
<div class="panel panel-default"> @if (Utils::isSelfHost() || request()->show_migration)
<div class="panel-heading"> <div class="panel panel-default">
<h3 class="panel-title">{!! trans('texts.migrate_to_next_version') !!}</h3> <div class="panel-heading">
</div> <h3 class="panel-title">{!! trans('texts.migrate_to_next_version') !!}</h3>
<div class="panel-body"> </div>
<div class="form-group"> <div class="panel-body">
<label for="modules" class="control-label col-lg-4 col-sm-4"></label> <div class="form-group">
<div class="col-lg-8 col-sm-8"> <label for="modules" class="control-label col-lg-4 col-sm-4"></label>
<div class="help-block">{{ trans('texts.migrate_intro_text')}}</div><br/> <div class="col-lg-8 col-sm-8">
@if(Auth::user()->eligibleForMigration()) <div class="help-block">{{ trans('texts.migrate_intro_text')}}</div><br/>
<a class="btn btn-primary btn-lg" @if(Auth::user()->eligibleForMigration())
href="{{ url('/migration/start') }}">{!! trans('texts.start_migration') !!}</a> <a class="btn btn-primary btn-lg"
@else href="{{ url('/migration/start') }}">{!! trans('texts.start_migration') !!}</a>
{{ trans('texts.not_allowed') }} @else
@endif {{ trans('texts.not_allowed') }}
<br/> @endif
<a href="https://invoiceninja.github.io/docs/migration/" target="_blank">{{ trans('texts.learn_more') }}</a> <br/>
<a href="https://invoiceninja.github.io/docs/migration/" target="_blank">{{ trans('texts.learn_more') }}</a>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> @endif
{!! Former::close() !!} {!! Former::close() !!}