Skip to content

Commit 3afe855

Browse files
committed
Merge branch 'development' into release
2 parents bfde896 + cdd446a commit 3afe855

File tree

14 files changed

+162
-125
lines changed

14 files changed

+162
-125
lines changed

app/Config/filesystems.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
'root' => public_path(),
3535
'serve' => false,
3636
'throw' => true,
37+
'directory_visibility' => 'public',
3738
],
3839

3940
'local_secure_attachments' => [

app/Uploads/ImageStorageDisk.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use Illuminate\Filesystem\FilesystemAdapter;
88
use Illuminate\Support\Facades\Log;
99
use League\Flysystem\UnableToSetVisibility;
10+
use League\Flysystem\Visibility;
1011
use Symfony\Component\HttpFoundation\StreamedResponse;
1112

1213
class ImageStorageDisk
@@ -85,7 +86,7 @@ public function put(string $path, string $data, bool $makePublic = false): void
8586
// require different ACLs for S3, and this provides us more logical control.
8687
if ($makePublic && !$this->isS3Like()) {
8788
try {
88-
$this->filesystem->setVisibility($path, 'public');
89+
$this->filesystem->setVisibility($path, Visibility::PUBLIC);
8990
} catch (UnableToSetVisibility $e) {
9091
Log::warning("Unable to set visibility for image upload with relative path: {$path}");
9192
}

bookstack-system-cli

485 Bytes
Binary file not shown.

composer.lock

Lines changed: 22 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lang/lv/activities.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,12 @@
8585
'webhook_delete_notification' => 'Webhook veiksmīgi izdzēsts',
8686

8787
// Imports
88-
'import_create' => 'created import',
89-
'import_create_notification' => 'Import successfully uploaded',
90-
'import_run' => 'updated import',
91-
'import_run_notification' => 'Content successfully imported',
92-
'import_delete' => 'deleted import',
93-
'import_delete_notification' => 'Import successfully deleted',
88+
'import_create' => 'izveidoja importu',
89+
'import_create_notification' => 'Imports veiksmīgi augšupielādēts',
90+
'import_run' => 'atjaunoja importu',
91+
'import_run_notification' => 'Saturs veiksmīgi importēts',
92+
'import_delete' => 'izdzēsa importu',
93+
'import_delete_notification' => 'Imports veiksmīgi dzēsts',
9494

9595
// Users
9696
'user_create' => 'izveidoja lietotāju',
@@ -128,12 +128,12 @@
128128
'comment_delete' => 'dzēsa komentāru',
129129

130130
// Sort Rules
131-
'sort_rule_create' => 'created sort rule',
132-
'sort_rule_create_notification' => 'Sort rule successfully created',
133-
'sort_rule_update' => 'updated sort rule',
134-
'sort_rule_update_notification' => 'Sort rule successfully updated',
135-
'sort_rule_delete' => 'deleted sort rule',
136-
'sort_rule_delete_notification' => 'Sort rule successfully deleted',
131+
'sort_rule_create' => 'izveidoja kārtošanas nosacījumu',
132+
'sort_rule_create_notification' => 'Kārtošanas nosacījums veiksmīgi izveidots',
133+
'sort_rule_update' => 'atjaunoja kārtošanas nosacījumu',
134+
'sort_rule_update_notification' => 'Kārtošanas nosacījums veiksmīgi atjaunots',
135+
'sort_rule_delete' => 'izdzēsa kārtošanas nosacījumu',
136+
'sort_rule_delete_notification' => 'Kārtošanas nosacījums veiksmīgi dzēsts',
137137

138138
// Other
139139
'permissions_update' => 'atjaunoja atļaujas',

lang/lv/common.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,5 +109,5 @@
109109
'terms_of_service' => 'Pakalpojuma noteikumi',
110110

111111
// OpenSearch
112-
'opensearch_description' => 'Search :appName',
112+
'opensearch_description' => 'Meklēt :appName',
113113
];

lang/lv/editor.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
'cancel' => 'Atcelt',
1414
'save' => 'Saglabāt',
1515
'close' => 'Aizvērt',
16-
'apply' => 'Apply',
16+
'apply' => 'Pielietot',
1717
'undo' => 'Atsaukt',
1818
'redo' => 'Atcelt atsaukšanu',
1919
'left' => 'Pa kreisi',
@@ -148,7 +148,7 @@
148148
'url' => 'URL',
149149
'text_to_display' => 'Attēlojamais teksts',
150150
'title' => 'Nosaukums',
151-
'browse_links' => 'Browse links',
151+
'browse_links' => 'Pārlūkot saites',
152152
'open_link' => 'Atvērt saiti',
153153
'open_link_in' => 'Atvērt saiti...',
154154
'open_link_current' => 'Šis logs',
@@ -165,8 +165,8 @@
165165
'about' => 'Par redaktoru',
166166
'about_title' => 'Par WYSIWYG redaktoru',
167167
'editor_license' => 'Redaktora licence un autortiesības',
168-
'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
169-
'editor_lexical_license_link' => 'Full license details can be found here.',
168+
'editor_lexical_license' => 'Šis redaktors ir izveidots, izmantojot :tinyLink, kas ir publicēts ar MIT licenci.',
169+
'editor_lexical_license_link' => 'Pilnu licences informāciju var atrast šeit.',
170170
'editor_tiny_license' => 'Šis redaktors ir izveidots, izmantojot :tinyLink, kas ir publicēts ar MIT licenci.',
171171
'editor_tiny_license_link' => 'TinyMCE autortiesības un licences detaļas var atrast šeit.',
172172
'save_continue' => 'Saglabāt lapu un turpināt',

lang/lv/entities.php

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -39,30 +39,30 @@
3939
'export_pdf' => 'PDF fails',
4040
'export_text' => 'Vienkāršs teksta fails',
4141
'export_md' => 'Markdown fails',
42-
'export_zip' => 'Portable ZIP',
42+
'export_zip' => 'Pārceļams ZIP arhīvs',
4343
'default_template' => 'Noklusētā lapas sagatave',
44-
'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
44+
'default_template_explain' => 'Norādīt lapas sagatavi, kas tiks izmantota kā noklusētais saturs visām jaunājām lapām šajā grāmatā. Ņemiet vērā, ka tā tiks izmantota tikai tad, ja lapas veidotājam ir skatīšanas tiesības izvēlētajai sagatavei.',
4545
'default_template_select' => 'Izvēlēt sagataves lapu',
46-
'import' => 'Import',
47-
'import_validate' => 'Validate Import',
48-
'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
49-
'import_zip_select' => 'Select ZIP file to upload',
50-
'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
51-
'import_pending' => 'Pending Imports',
52-
'import_pending_none' => 'No imports have been started.',
53-
'import_continue' => 'Continue Import',
54-
'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
55-
'import_details' => 'Import Details',
56-
'import_run' => 'Run Import',
57-
'import_size' => ':size Import ZIP Size',
58-
'import_uploaded_at' => 'Uploaded :relativeTime',
59-
'import_uploaded_by' => 'Uploaded by',
60-
'import_location' => 'Import Location',
61-
'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
62-
'import_delete_confirm' => 'Are you sure you want to delete this import?',
63-
'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
64-
'import_errors' => 'Import Errors',
65-
'import_errors_desc' => 'The follow errors occurred during the import attempt:',
46+
'import' => 'Importēt',
47+
'import_validate' => 'Pārbaudīt importu',
48+
'import_desc' => 'Importēt grāmatas, nodaļas un lapas izmantojot pārceļamu ZIP arhīvu no šīs vai citas sistēmas instances. Izvēlietites ZIP failu, lai turpinātu. Kad fails ir augšupielādēts un pārbaudīts, jūs varēsiet veikt importa uzstādījumus un to apstiprināt nākamajā skatā.',
49+
'import_zip_select' => 'Izvēlieties ZIP failu, ko augšupielādēt',
50+
'import_zip_validation_errors' => 'Pārbaudot ZIP failu atrastas šādas kļūdas:',
51+
'import_pending' => 'Gaidošie importi',
52+
'import_pending_none' => 'Neviens imports nav uzsākts.',
53+
'import_continue' => 'Turpināt importu',
54+
'import_continue_desc' => 'Pārlūkot saturu, kas tiktu importēts no augšupielādētā ZIP faila. Kad esat gatavs, palaidiet importu, lai pievienotu tā saturu šai sistēmai. Augšupielādētais ZIP fails tiks automātiski izvākts pēc veiksmīga importa.',
55+
'import_details' => 'Importa detaļas',
56+
'import_run' => 'Palaist importu',
57+
'import_size' => ':size importa ZIP izmērs',
58+
'import_uploaded_at' => 'Augšupielādes laiks :relativeTime',
59+
'import_uploaded_by' => 'Augšupielādēja',
60+
'import_location' => 'Importa vieta',
61+
'import_location_desc' => 'Izvēlieties mērķa vietu jūsu importētajam saturam. Jums būs nepieciešamas attiecīgās piekļuves tiesības, lai izveidotu saturu izvēlētajā vietā.',
62+
'import_delete_confirm' => 'Vai tiešām vēlaties dzēst šo importu?',
63+
'import_delete_desc' => 'Šis izdzēsīs augšupielādēto importa ZIP failu, un šo darbību nevarēs atcelt.',
64+
'import_errors' => 'Importa kļūdas',
65+
'import_errors_desc' => 'Importa mēģinājumā atgadījās šīs kļūdas:',
6666

6767
// Permissions and restrictions
6868
'permissions' => 'Atļaujas',
@@ -247,8 +247,8 @@
247247
'pages_edit_switch_to_markdown_clean' => '(Iztīrītais saturs)',
248248
'pages_edit_switch_to_markdown_stable' => '(Stabilais saturs)',
249249
'pages_edit_switch_to_wysiwyg' => 'Pārslēgties uz WYSIWYG redaktoru',
250-
'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
251-
'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
250+
'pages_edit_switch_to_new_wysiwyg' => 'Pārslēgties uz jauno WYSIWYG redaktoru',
251+
'pages_edit_switch_to_new_wysiwyg_desc' => '(Alfa testēšanā)',
252252
'pages_edit_set_changelog' => 'Pievienot izmaiņu aprakstu',
253253
'pages_edit_enter_changelog_desc' => 'Ievadi nelielu aprakstu par vaiktajām izmaiņām',
254254
'pages_edit_enter_changelog' => 'Izmaiņu apraksts',
@@ -452,9 +452,9 @@
452452
'watch_desc_comments_page' => 'Paziņot par lapu izmaiņām un jauniem komentāriem.',
453453
'watch_change_default' => 'Izmainīt noklusētos paziņojumu uzstādījumus',
454454
'watch_detail_ignore' => 'Ignorēt paziņojumus',
455-
'watch_detail_new' => 'Watching for new pages',
456-
'watch_detail_updates' => 'Watching new pages and updates',
457-
'watch_detail_comments' => 'Watching new pages, updates & comments',
455+
'watch_detail_new' => 'Vērot jaunas lapas',
456+
'watch_detail_updates' => 'Vērot jaunas lapas un atjauninājumus',
457+
'watch_detail_comments' => 'Vērot jaunas lapas, atjauninājumus un komentārus',
458458
'watch_detail_parent_book' => 'Watching via parent book',
459459
'watch_detail_parent_book_ignore' => 'Ignoring via parent book',
460460
'watch_detail_parent_chapter' => 'Watching via parent chapter',

lang/lv/errors.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
// Users
7979
'users_cannot_delete_only_admin' => 'Jūs nevarat dzēst vienīgo administratoru',
8080
'users_cannot_delete_guest' => 'Jūs nevarat dzēst lietotāju "viesis"',
81-
'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
81+
'users_could_not_send_invite' => 'Neizdevās izveidot lietotāju, jo neizdevās nosūtīt ielūguma epastu',
8282

8383
// Roles
8484
'role_cannot_be_edited' => 'Šo lomu nevar rediģēt',
@@ -106,16 +106,16 @@
106106
'back_soon' => 'Drīz būs atkal pieejams.',
107107

108108
// Import
109-
'import_zip_cant_read' => 'Could not read ZIP file.',
110-
'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
111-
'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
112-
'import_validation_failed' => 'Import ZIP failed to validate with errors:',
113-
'import_zip_failed_notification' => 'Failed to import ZIP file.',
114-
'import_perms_books' => 'You are lacking the required permissions to create books.',
115-
'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
116-
'import_perms_pages' => 'You are lacking the required permissions to create pages.',
117-
'import_perms_images' => 'You are lacking the required permissions to create images.',
118-
'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
109+
'import_zip_cant_read' => 'Nevarēja nolasīt ZIP failu.',
110+
'import_zip_cant_decode_data' => 'Nevarēja atrast un nolasīt data.json saturu ZIP failā.',
111+
'import_zip_no_data' => 'ZIP faila datos nav atrasts grāmatu, nodaļu vai lapu saturs.',
112+
'import_validation_failed' => 'ZIP faila imports ir neveiksmīgs ar šādām kļūdām:',
113+
'import_zip_failed_notification' => 'ZIP faila imports ir neveiksmīgs.',
114+
'import_perms_books' => 'Jums nav nepieciešamo tiesību izveidot grāmatas.',
115+
'import_perms_chapters' => 'Jums nav nepieciešamo tiesību izveidot nodaļas.',
116+
'import_perms_pages' => 'Jums nav nepieciešamo tiesību izveidot lapas.',
117+
'import_perms_images' => 'Jums nav nepieciešamo tiesību izviedot attēlus.',
118+
'import_perms_attachments' => 'Jums nav nepieciešamo tiesību izveidot pielikumus.',
119119

120120
// API errors
121121
'api_no_authorization_found' => 'Pieprasījumā nav atrasts autorizācijas žetons',

0 commit comments

Comments
 (0)