Skip to content

Commit

Permalink
#2686 Changed description for uploading plugins
Browse files Browse the repository at this point in the history
  • Loading branch information
RomanovM committed Oct 26, 2017
1 parent 3dda6bc commit ea1e68a
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 5 deletions.
Expand Up @@ -5017,13 +5017,16 @@
<Value>Upload plugin</Value>
</LocaleResource>
<LocaleResource Name="Admin.Configuration.Plugins.Upload.Hint1">
<Value>The archive should contain only one root plugin directory. For example, Payments.PayPalDirect.</Value>
<Value>The archive should contain only one root plugin directory (already compiled). For example, Payments.PayPalDirect.</Value>
</LocaleResource>
<LocaleResource Name="Admin.Configuration.Plugins.Upload.Hint2">
<Value>The archive should contain only already compiled plugin version.</Value>
<Value>Or it should has the uploadedPlugins.json file with the archive structure (in case if the archive has many subdirectories or plugins).</Value>
</LocaleResource>
<LocaleResource Name="Admin.Configuration.Plugins.Upload.Hint3">
<Value>Please note that you can also manually upload a plugin using FTP if this method doesn't work for you.</Value>
<Value>Please note that if the plugin directory already exists, it will be overwritten.</Value>
</LocaleResource>
<LocaleResource Name="Admin.Configuration.Plugins.Upload.Hint4">
<Value>You can also manually upload a plugin using FTP if this method doesn't work for you.</Value>
</LocaleResource>
<LocaleResource Name="Admin.Configuration.Plugins.Upload.Progress">
<Value>Uploading plugin...</Value>
Expand Down
7 changes: 5 additions & 2 deletions src/Presentation/Nop.Web/Areas/Admin/Views/Plugin/List.cshtml
Expand Up @@ -289,14 +289,17 @@
<div class="modal-body">
<ul class="common-list">
<li>
<em>@T("Admin.Configuration.Plugins.Upload.Hint1")</em>
@T("Admin.Configuration.Plugins.Upload.Hint1")
</li>
<li>
<em>@T("Admin.Configuration.Plugins.Upload.Hint2")</em>
@T("Admin.Configuration.Plugins.Upload.Hint2")
</li>
<li>
<em>@T("Admin.Configuration.Plugins.Upload.Hint3")</em>
</li>
<li>
<em>@T("Admin.Configuration.Plugins.Upload.Hint4")</em>
</li>
</ul>
<div class="form-group">
<div class="col-md-2">
Expand Down
12 changes: 12 additions & 0 deletions upgradescripts/3.90-4.00 (under development)/upgrade.sql
Expand Up @@ -416,6 +416,18 @@ set @resources='
<LocaleResource Name="Admin.Catalog.Products.SpecificationAttributes.SelectOption">
<Value>Select specification attribute option</Value>
</LocaleResource>
<LocaleResource Name="Admin.Configuration.Plugins.Upload.Hint1">
<Value>The archive should contain only one root plugin directory (already compiled). For example, Payments.PayPalDirect.</Value>
</LocaleResource>
<LocaleResource Name="Admin.Configuration.Plugins.Upload.Hint2">
<Value>Or it should has the uploadedPlugins.json file with the archive structure (in case if the archive has many subdirectories or plugins).</Value>
</LocaleResource>
<LocaleResource Name="Admin.Configuration.Plugins.Upload.Hint3">
<Value>Please note that if the plugin directory already exists, it will be overwritten.</Value>
</LocaleResource>
<LocaleResource Name="Admin.Configuration.Plugins.Upload.Hint4">
<Value>You can also manually upload a plugin using FTP if this method doesn''t work for you.</Value>
</LocaleResource>
</Language>
'

Expand Down

0 comments on commit ea1e68a

Please sign in to comment.