AntonLV 8 лет назад
Родитель
Сommit
1a93e201b1

+ 4 - 2
modules/boonex/files/install/langs/en.xml

@@ -36,9 +36,11 @@
 	<string name="_bx_files_form_entry_input_delete_confirm_info"><![CDATA[This action can not be undone]]></string>
 	<string name="_bx_files_form_entry_input_delete_confirm_error"><![CDATA[Please check this checkbox if you really want to delete the file]]></string>
 	<string name="_bx_files_form_entry_input_sys_attachment"><![CDATA[File]]></string>
-    <string name="_bx_files_form_entry_input_attachment"><![CDATA[File]]></string>
+        <string name="_bx_files_form_entry_input_attachment"><![CDATA[File]]></string>
+        <string name="_bx_files_form_entry_input_attachment_err"><![CDATA[File is essential. Please, upload a file.]]></string>
 	<string name="_bx_files_form_entry_input_sys_attachments"><![CDATA[Files]]></string>
-	<string name="_bx_files_form_entry_input_attachments"><![CDATA[Files]]></string>    
+	<string name="_bx_files_form_entry_input_attachments"><![CDATA[Files]]></string>
+        <string name="_bx_files_form_entry_input_attachments_err"><![CDATA[File is essential. Please, upload some file(s).]]></string>    
     <string name="_bx_files_form_entry_input_sys_allow_view_to"><![CDATA[Visibility]]></string>
     <string name="_bx_files_form_entry_input_allow_view_to"><![CDATA[Visibility]]></string>
     <string name="_bx_files_form_entry_input_picture_use_as_thumb"><![CDATA[Cover Image]]></string>

+ 2 - 2
modules/boonex/files/install/sql/install.sql

@@ -200,7 +200,7 @@ INSERT INTO `sys_form_inputs`(`object`, `module`, `name`, `value`, `values`, `ch
 ('bx_files', 'bx_files', 'delete_confirm', 1, '', 0, 'checkbox', '_bx_files_form_entry_input_sys_delete_confirm', '_bx_files_form_entry_input_delete_confirm', '_bx_files_form_entry_input_delete_confirm_info', 1, 0, 0, '', '', '', 'Avail', '', '_bx_files_form_entry_input_delete_confirm_error', '', '', 1, 0),
 ('bx_files', 'bx_files', 'do_publish', '_bx_files_form_entry_input_do_publish', '', 0, 'submit', '_bx_files_form_entry_input_sys_do_publish', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
 ('bx_files', 'bx_files', 'do_submit', '_bx_files_form_entry_input_do_submit', '', 0, 'submit', '_bx_files_form_entry_input_sys_do_submit', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
-('bx_files', 'bx_files', 'attachments', 'a:1:{i:0;s:14:"bx_files_html5";}', 'a:2:{s:15:"bx_files_simple";s:26:"_sys_uploader_simple_title";s:14:"bx_files_html5";s:25:"_sys_uploader_html5_title";}', 0, 'files', '_bx_files_form_entry_input_sys_attachments', '_bx_files_form_entry_input_attachments', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
+('bx_files', 'bx_files', 'attachments', 'a:1:{i:0;s:14:"bx_files_html5";}', 'a:2:{s:15:"bx_files_simple";s:26:"_sys_uploader_simple_title";s:14:"bx_files_html5";s:25:"_sys_uploader_html5_title";}', 0, 'files', '_bx_files_form_entry_input_sys_attachment', '_bx_files_form_entry_input_attachment', '', 1, 0, 0, '', '', '', 'avail', '', '_bx_files_form_entry_input_attachment', '', '', 1, 0),
 ('bx_files', 'bx_files', 'desc', '', '', 0, 'textarea', '_bx_files_form_entry_input_sys_desc', '_bx_files_form_entry_input_desc', '', 0, 0, 2, '', '', '', '', '', '', 'XssHtml', '', 1, 0),
 ('bx_files', 'bx_files', 'data', '', '', 0, 'textarea', '_bx_files_form_entry_input_sys_data', '_bx_files_form_entry_input_data', '', 0, 0, 0, '', '', '', '', '', '', 'Xss', '', 0, 0),
 ('bx_files', 'bx_files', 'title', '', '', 0, 'text', '_bx_files_form_entry_input_sys_title', '_bx_files_form_entry_input_title', '', 1, 0, 0, '', '', '', 'Avail', '', '_bx_files_form_entry_input_title_err', 'Xss', '', 1, 0),
@@ -208,7 +208,7 @@ INSERT INTO `sys_form_inputs`(`object`, `module`, `name`, `value`, `values`, `ch
 ('bx_files', 'bx_files', 'added', '', '', 0, 'datetime', '_bx_files_form_entry_input_sys_date_added', '_bx_files_form_entry_input_date_added', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
 ('bx_files', 'bx_files', 'changed', '', '', 0, 'datetime', '_bx_files_form_entry_input_sys_date_changed', '_bx_files_form_entry_input_date_changed', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
 
-('bx_files_upload', 'bx_files', 'attachments', 'a:1:{i:0;s:14:"bx_files_html5";}', 'a:2:{s:15:"bx_files_simple";s:26:"_sys_uploader_simple_title";s:14:"bx_files_html5";s:25:"_sys_uploader_html5_title";}', 0, 'files', '_bx_files_form_entry_input_sys_attachment', '_bx_files_form_entry_input_attachment', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
+('bx_files_upload', 'bx_files', 'attachments', 'a:1:{i:0;s:14:"bx_files_html5";}', 'a:2:{s:15:"bx_files_simple";s:26:"_sys_uploader_simple_title";s:14:"bx_files_html5";s:25:"_sys_uploader_html5_title";}', 0, 'files', '_bx_files_form_entry_input_sys_attachments', '_bx_files_form_entry_input_attachments', '', 1, 0, 0, '', '', '', 'avail', '', '_bx_files_form_entry_input_attachments', '', '', 1, 0),
 ('bx_files_upload', 'bx_files', 'cat', '', '#!bx_files_cats', 0, 'select', '_bx_files_form_entry_input_sys_cat', '_bx_files_form_entry_input_cat', '', 1, 0, 0, '', '', '', 'avail', '', '_bx_files_form_entry_input_cat_err', 'Xss', '', 1, 0),
 ('bx_files_upload', 'bx_files', 'allow_view_to', '', '', 0, 'custom', '_bx_files_form_entry_input_sys_allow_view_to', '_bx_files_form_entry_input_allow_view_to', '', 1, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
 ('bx_files_upload', 'bx_files', 'do_submit', '_bx_files_form_entry_input_do_submit', '', 0, 'submit', '_bx_files_form_entry_input_sys_do_submit', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),

+ 9 - 7
modules/boonex/photos/install/langs/en.xml

@@ -34,11 +34,13 @@
     <string name="_bx_photos_form_entry_input_delete_confirm"><![CDATA[I am sure I want to delete this photo]]></string>
     <string name="_bx_photos_form_entry_input_delete_confirm_info"><![CDATA[This action can not be undone]]></string>
     <string name="_bx_photos_form_entry_input_delete_confirm_error"><![CDATA[Please check this checkbox if you really want to delete the photo]]></string>
-    <string name="_bx_photos_form_entry_input_sys_pictures"><![CDATA[Photo]]></string>
-    <string name="_bx_photos_form_entry_input_pictures"><![CDATA[Photo]]></string>
+    <string name="_bx_photos_form_entry_input_sys_pictures"><![CDATA[Photos]]></string>
+    <string name="_bx_photos_form_entry_input_pictures"><![CDATA[Photos]]></string>
+    <string name="_bx_photos_form_entry_input_pictures_err"><![CDATA[Photo is essential. Please, upload some photo(s).]]></string>
     <string name="_bx_photos_form_entry_input_pictures_upload"><![CDATA[Upload]]></string>
-    <string name="_bx_photos_form_entry_input_sys_attachment"><![CDATA[Photo]]></string>
-    <string name="_bx_photos_form_entry_input_attachment"><![CDATA[Photo]]></string>
+    <string name="_bx_photos_form_entry_input_sys_picture"><![CDATA[Photo]]></string>
+    <string name="_bx_photos_form_entry_input_picture"><![CDATA[Photo]]></string>
+    <string name="_bx_photos_form_entry_input_picture_err"><![CDATA[Photo is essential. Please, upload a photo.]]></string>
     <string name="_bx_photos_form_entry_input_sys_allow_view_to"><![CDATA[Visibility]]></string>
     <string name="_bx_photos_form_entry_input_allow_view_to"><![CDATA[Visibility]]></string>
     <string name="_bx_photos_form_entry_input_picture_use_as_thumb"><![CDATA[Cover Image]]></string>
@@ -56,9 +58,9 @@
 	<string name="_bx_photos_acl_action_set_thumb"><![CDATA[Set Photo Thumbnail]]></string>
 	<string name="_bx_photos_acl_action_edit_any_entry"><![CDATA[Edit Any Photo]]></string>
 
-	<string name="_bx_photos_page_title_sys_create_entry"><![CDATA[New Photo]]></string>
-	<string name="_bx_photos_page_title_create_entry"><![CDATA[New Photo]]></string>
-	<string name="_bx_photos_page_block_title_create_entry"><![CDATA[New Photo]]></string>
+	<string name="_bx_photos_page_title_sys_create_entry"><![CDATA[Upload Photos]]></string>
+	<string name="_bx_photos_page_title_create_entry"><![CDATA[Upload Photos]]></string>
+	<string name="_bx_photos_page_block_title_create_entry"><![CDATA[Upload Photos]]></string>
 	<string name="_bx_photos_page_title_sys_edit_entry"><![CDATA[Edit]]></string>
 	<string name="_bx_photos_page_title_edit_entry"><![CDATA[Edit]]></string>
 	<string name="_bx_photos_page_block_title_edit_entry"><![CDATA[Edit]]></string>

+ 2 - 2
modules/boonex/photos/install/sql/install.sql

@@ -237,14 +237,14 @@ INSERT INTO `sys_form_inputs`(`object`, `module`, `name`, `value`, `values`, `ch
 ('bx_photos', 'bx_photos', 'do_publish', '_bx_photos_form_entry_input_do_publish', '', 0, 'submit', '_bx_photos_form_entry_input_sys_do_publish', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
 ('bx_photos', 'bx_photos', 'do_submit', '_bx_photos_form_entry_input_do_submit', '', 0, 'submit', '_bx_photos_form_entry_input_sys_do_submit', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
 ('bx_photos', 'bx_photos', 'location', '', '', 0, 'location', '_sys_form_input_sys_location', '_sys_form_input_location', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
-('bx_photos', 'bx_photos', 'pictures', 'a:1:{i:0;s:15:"bx_photos_html5";}', 'a:2:{s:16:"bx_photos_simple";s:26:"_sys_uploader_simple_title";s:15:"bx_photos_html5";s:25:"_sys_uploader_html5_title";}', 0, 'files', '_bx_photos_form_entry_input_sys_pictures', '_bx_photos_form_entry_input_pictures', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
+('bx_photos', 'bx_photos', 'pictures', 'a:1:{i:0;s:15:"bx_photos_html5";}', 'a:2:{s:16:"bx_photos_simple";s:26:"_sys_uploader_simple_title";s:15:"bx_photos_html5";s:25:"_sys_uploader_html5_title";}', 0, 'files', '_bx_photos_form_entry_input_sys_picture', '_bx_photos_form_entry_input_picture', '', 1, 0, 0, '', '', '', 'avail', '', '_bx_photos_form_entry_input_picture_err', '', '', 1, 0),
 ('bx_photos', 'bx_photos', 'text', '', '', 0, 'textarea', '_bx_photos_form_entry_input_sys_text', '_bx_photos_form_entry_input_text', '', 0, 0, 3, '', '', '', '', '', '', 'XssHtml', '', 1, 0),
 ('bx_photos', 'bx_photos', 'title', '', '', 0, 'text', '_bx_photos_form_entry_input_sys_title', '_bx_photos_form_entry_input_title', '', 1, 0, 0, '', '', '', 'Avail', '', '_bx_photos_form_entry_input_title_err', 'Xss', '', 1, 0),
 ('bx_photos', 'bx_photos', 'cat', '', '#!bx_photos_cats', 0, 'select', '_bx_photos_form_entry_input_sys_cat', '_bx_photos_form_entry_input_cat', '', 1, 0, 0, '', '', '', 'avail', '', '_bx_photos_form_entry_input_cat_err', 'Xss', '', 1, 0),
 ('bx_photos', 'bx_photos', 'added', '', '', 0, 'datetime', '_bx_photos_form_entry_input_sys_date_added', '_bx_photos_form_entry_input_date_added', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
 ('bx_photos', 'bx_photos', 'changed', '', '', 0, 'datetime', '_bx_photos_form_entry_input_sys_date_changed', '_bx_photos_form_entry_input_date_changed', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
 
-('bx_photos_upload', 'bx_photos', 'pictures', 'a:1:{i:0;s:15:"bx_photos_html5";}', 'a:2:{s:16:"bx_photos_simple";s:26:"_sys_uploader_simple_title";s:15:"bx_photos_html5";s:25:"_sys_uploader_html5_title";}', 0, 'files', '_bx_photos_form_entry_input_sys_attachment', '_bx_photos_form_entry_input_attachment', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
+('bx_photos_upload', 'bx_photos', 'pictures', 'a:1:{i:0;s:15:"bx_photos_html5";}', 'a:2:{s:16:"bx_photos_simple";s:26:"_sys_uploader_simple_title";s:15:"bx_photos_html5";s:25:"_sys_uploader_html5_title";}', 0, 'files', '_bx_photos_form_entry_input_sys_pictures', '_bx_photos_form_entry_input_pictures', '', 1, 0, 0, '', '', '', 'avail', '', '_bx_photos_form_entry_input_pictures_err', '', '', 1, 0),
 ('bx_photos_upload', 'bx_photos', 'cat', '', '#!bx_photos_cats', 0, 'select', '_bx_photos_form_entry_input_sys_cat', '_bx_photos_form_entry_input_cat', '', 1, 0, 0, '', '', '', 'avail', '', '_bx_photos_form_entry_input_cat_err', 'Xss', '', 1, 0),
 ('bx_photos_upload', 'bx_photos', 'allow_view_to', '', '', 0, 'custom', '_bx_photos_form_entry_input_sys_allow_view_to', '_bx_photos_form_entry_input_allow_view_to', '', 1, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
 ('bx_photos_upload', 'bx_photos', 'do_submit', '_bx_photos_form_entry_input_do_submit', '', 0, 'submit', '_bx_photos_form_entry_input_sys_do_submit', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),

+ 4 - 2
modules/boonex/russian/data/langs/bx_files/ru.xml

@@ -36,9 +36,11 @@
 	<string name="_bx_files_form_entry_input_delete_confirm_info"><![CDATA[Это действие не может быть отменено]]></string>
 	<string name="_bx_files_form_entry_input_delete_confirm_error"><![CDATA[Нужно подтвердить удаление файла]]></string>
 	<string name="_bx_files_form_entry_input_sys_attachment"><![CDATA[Файл]]></string>
-    <string name="_bx_files_form_entry_input_attachment"><![CDATA[Файл]]></string>
+        <string name="_bx_files_form_entry_input_attachment"><![CDATA[Файл]]></string>
+        <string name="_bx_files_form_entry_input_attachment_err"><![CDATA[Файл обязателен. Пожалуйста, загрузите файл.]]></string>
 	<string name="_bx_files_form_entry_input_sys_attachments"><![CDATA[Файлы]]></string>
-	<string name="_bx_files_form_entry_input_attachments"><![CDATA[Файлы]]></string>    
+	<string name="_bx_files_form_entry_input_attachments"><![CDATA[Файлы]]></string>
+        <string name="_bx_files_form_entry_input_attachments_err"><![CDATA[Файл обязателен. Пожалуйста, загрузите один или более файлов.]]></string>
     <string name="_bx_files_form_entry_input_sys_allow_view_to"><![CDATA[Видимость]]></string>
     <string name="_bx_files_form_entry_input_allow_view_to"><![CDATA[Видимость]]></string>
     <string name="_bx_files_form_entry_input_picture_use_as_thumb"><![CDATA[Обложка]]></string>

+ 9 - 7
modules/boonex/russian/data/langs/bx_photos/ru.xml

@@ -34,11 +34,13 @@
     <string name="_bx_photos_form_entry_input_delete_confirm"><![CDATA[Я уверен(а), что хочу удалить это фото]]></string>
     <string name="_bx_photos_form_entry_input_delete_confirm_info"><![CDATA[Это действие не может быть отменено]]></string>
     <string name="_bx_photos_form_entry_input_delete_confirm_error"><![CDATA[Пожалуйста, отметьте этот флажок, если действительно хотите удалить фото]]></string>
-    <string name="_bx_photos_form_entry_input_sys_pictures"><![CDATA[Картинки]]></string>
-    <string name="_bx_photos_form_entry_input_pictures"><![CDATA[Картинки]]></string>
+    <string name="_bx_photos_form_entry_input_sys_pictures"><![CDATA[Фото]]></string>
+    <string name="_bx_photos_form_entry_input_pictures"><![CDATA[Фото]]></string>
+    <string name="_bx_photos_form_entry_input_pictures_err"><![CDATA[Фото обязательно. Пожалуйста, загрузите одно или более фото.]]></string>
     <string name="_bx_photos_form_entry_input_pictures_upload"><![CDATA[Загрузить]]></string>
-    <string name="_bx_photos_form_entry_input_sys_attachment"><![CDATA[Фото]]></string>
-    <string name="_bx_photos_form_entry_input_attachment"><![CDATA[Фото]]></string>
+    <string name="_bx_photos_form_entry_input_sys_picture"><![CDATA[Фото]]></string>
+    <string name="_bx_photos_form_entry_input_picture"><![CDATA[Фото]]></string>
+    <string name="_bx_photos_form_entry_input_picture_err"><![CDATA[Фото обязательно. Пожалуйста, загрузите фото.]]></string>
     <string name="_bx_photos_form_entry_input_sys_allow_view_to"><![CDATA[Видимость]]></string>
     <string name="_bx_photos_form_entry_input_allow_view_to"><![CDATA[Видимость]]></string>
     <string name="_bx_photos_form_entry_input_picture_use_as_thumb"><![CDATA[Изображение обложки]]></string>
@@ -56,9 +58,9 @@
 	<string name="_bx_photos_acl_action_set_thumb"><![CDATA[Назначить значок фото]]></string>
 	<string name="_bx_photos_acl_action_edit_any_entry"><![CDATA[Редактировать любое фото]]></string>
 
-	<string name="_bx_photos_page_title_sys_create_entry"><![CDATA[Новое фото]]></string>
-	<string name="_bx_photos_page_title_create_entry"><![CDATA[Новое фото]]></string>
-	<string name="_bx_photos_page_block_title_create_entry"><![CDATA[Новое фото]]></string>
+	<string name="_bx_photos_page_title_sys_create_entry"><![CDATA[Загрузить фото]]></string>
+	<string name="_bx_photos_page_title_create_entry"><![CDATA[Загрузить фото]]></string>
+	<string name="_bx_photos_page_block_title_create_entry"><![CDATA[Загрузить фото]]></string>
 	<string name="_bx_photos_page_title_sys_edit_entry"><![CDATA[Редактировать фото]]></string>
 	<string name="_bx_photos_page_title_edit_entry"><![CDATA[Редактировать фото]]></string>
 	<string name="_bx_photos_page_block_title_edit_entry"><![CDATA[Редактировать фото]]></string>