Improve multilanguage support - Fixes #1228

This commit is contained in:
Samuel Georges 2015-06-27 09:33:09 +10:00
parent 3e95ee555f
commit eb5af8ae85
7 changed files with 18 additions and 13 deletions

View File

@ -40,7 +40,7 @@
</div>
<div class="modal-footer">
<a href="<?= $file->pathUrl ?>" class="pull-left btn btn-link fileupload-url-button" target="_blank">
<i class="oc-icon-link"></i>Attachment URL
<i class="oc-icon-link"></i><?= e(trans('backend::lang.fileupload.attachment_url')) ?>
</a>
<button
type="submit"

View File

@ -12,7 +12,7 @@
<!-- Upload Button -->
<button type="button" class="btn btn-sm btn-primary oc-icon-upload upload-button">
Upload file
<?= e(trans('backend::lang.fileupload.upload_file')) ?>
</button>
<!-- Existing files -->
@ -29,7 +29,7 @@
href="javascript:;"
class="upload-remove-button"
data-request="<?= $this->getEventHandler('onRemoveAttachment') ?>"
data-request-confirm="Are you sure?"
data-request-confirm="<?= e(trans('backend::lang.fileupload.remove_confirm')) ?>"
data-request-data="file_id: <?= $file->id ?>"
><i class="icon-times"></i></a>
</h4>
@ -57,7 +57,7 @@
href="javascript:;"
class="upload-remove-button"
data-request="<?= $this->getEventHandler('onRemoveAttachment') ?>"
data-request-confirm="Are you sure?"
data-request-confirm="<?= e(trans('backend::lang.fileupload.remove_confirm')) ?>"
><i class="icon-times"></i></a>
</h4>
<p class="size" data-dz-size></p>

View File

@ -32,7 +32,7 @@
href="javascript:;"
class="upload-remove-button"
data-request="<?= $this->getEventHandler('onRemoveAttachment') ?>"
data-request-confirm="Are you sure?"
data-request-confirm="<?= e(trans('backend::lang.fileupload.remove_confirm')) ?>"
data-request-data="file_id: <?= $singleFile->id ?>"
><i class="icon-times"></i></a>
</div>
@ -65,7 +65,7 @@
href="javascript:;"
class="upload-remove-button"
data-request="<?= $this->getEventHandler('onRemoveAttachment') ?>"
data-request-confirm="Are you sure?"
data-request-confirm="<?= e(trans('backend::lang.fileupload.remove_confirm')) ?>"
><i class="icon-times"></i></a>
<div class="progress-bar"><span class="upload-progress" data-dz-uploadprogress></span></div>
<div class="error-message"><span data-dz-errormessage></span></div>

View File

@ -27,12 +27,12 @@
<!-- Error template -->
<script type="text/template" id="<?= $this->getId('errorTemplate') ?>">
<div class="popover-head">
<h3>Upload error</h3>
<h3><?= e(trans('backend::lang.fileupload.upload_error')) ?></h3>
<p>{{errorMsg}}</p>
<button type="button" class="close" data-dismiss="popover" aria-hidden="true">&times;</button>
</div>
<div class="popover-body">
<button class="btn btn-danger" data-remove-file>Remove file</button>
<button class="btn btn-danger" data-remove-file><?= e(trans('backend::lang.fileupload.remove_file')) ?></button>
</div>
</script>

View File

@ -29,7 +29,7 @@
href="javascript:;"
class="upload-remove-button"
data-request="<?= $this->getEventHandler('onRemoveAttachment') ?>"
data-request-confirm="Are you sure?"
data-request-confirm="<?= e(trans('backend::lang.fileupload.remove_confirm')) ?>"
data-request-data="file_id: <?= $file->id ?>"
><i class="icon-times"></i></a>
</h4>
@ -56,7 +56,7 @@
href="javascript:;"
class="upload-remove-button"
data-request="<?= $this->getEventHandler('onRemoveAttachment') ?>"
data-request-confirm="Are you sure?"
data-request-confirm="<?= e(trans('backend::lang.fileupload.remove_confirm')) ?>"
><i class="icon-times"></i></a>
</h4>
<p class="size" data-dz-size></p>

View File

@ -31,7 +31,7 @@
href="javascript:;"
class="upload-remove-button"
data-request="<?= $this->getEventHandler('onRemoveAttachment') ?>"
data-request-confirm="Are you sure?"
data-request-confirm="<?= e(trans('backend::lang.fileupload.remove_confirm')) ?>"
data-request-data="file_id: <?= $singleFile->id ?>"
><i class="icon-times"></i></a>
</h4>
@ -57,7 +57,7 @@
href="javascript:;"
class="upload-remove-button"
data-request="<?= $this->getEventHandler('onRemoveAttachment') ?>"
data-request-confirm="Are you sure?"
data-request-confirm="<?= e(trans('backend::lang.fileupload.remove_confirm')) ?>"
><i class="icon-times"></i></a>
</h4>
<p class="size" data-dz-size></p>

View File

@ -144,7 +144,12 @@ return [
'help' => 'Add a title and description for this attachment.',
'title_label' => 'Title',
'description_label' => 'Description',
'default_prompt' => 'Click the %s or drag a file here to upload'
'default_prompt' => 'Click the %s or drag a file here to upload',
'attachment_url' => 'Attachment URL',
'upload_file' => 'Upload file',
'upload_error' => 'Upload error',
'remove_confirm' => 'Are you sure?',
'remove_file' => 'Remove file'
],
'form' => [
'create_title' => 'New :name',