diff --git a/Redaction/Clean.xba b/Redaction/Clean.xba index b9761ab..771ac35 100644 --- a/Redaction/Clean.xba +++ b/Redaction/Clean.xba @@ -1,6 +1,6 @@ -Sub mark47 +Sub mark48 End Sub @@ -18,6 +18,26 @@ Private Sub makerUpMenu Dim dialog As Object DialogLibraries.LoadLibrary("Redaction") dialog = CreateUnoDialog(DialogLibraries.Redaction.CleaningDialog) + + dialog.getControl("fontsInStyles").Label = getTranslation("advancedMenuReplaceFontsInStyles") + dialog.getControl("symbolsConversion").Label = getTranslation("advancedMenuSymbolsConversion") + dialog.getControl("cleanFormatting").Label = getTranslation("advancedMenuCleanFormatting") + dialog.getControl("replaceWhiteBackground").Label = getTranslation("advancedMenuReplaceWhiteBackground") + dialog.getControl("removeUnusedStyles").Label = getTranslation("advancedMenuRemoveUnusedStyles") + dialog.getControl("removeLinks").Label = getTranslation("advancedMenuRemoveLinks") + dialog.getControl("removeBookmarks").Label = getTranslation("advancedMenuRemoveBookmarks") + dialog.getControl("configTables").Label = getTranslation("advancedMenuConfigTables") + dialog.getControl("configAnchors").Label = getTranslation("advancedMenuConfigAnchors") + dialog.getControl("fixMistakes").Label = getTranslation("advancedMenuFixMistakes") + dialog.getControl("removeInitPageBreak").Label = getTranslation("advancedMenuRemoveInitPageBreak") + dialog.getControl("removePageStyles").Label = getTranslation("advancedMenuRemovePageStyles") + dialog.getControl("loadStandardStyles").Label = getTranslation("advancedMenuLoadStandardStyles") + dialog.getControl("removeManualPageBreaks").Label = getTranslation("advancedMenuRemoveManualPageBreaks") + dialog.getControl("removeBasic").Label = getTranslation("advancedMenuRemoveBasic") + dialog.getControl("Cancel").Label = getTranslation("buttonCancel") + dialog.getControl("OK").Label = getTranslation("buttonOK") + dialog.getControl("buttonLoad").Label = getTranslation("buttonLoad") + dialog.Title = getTranslation("advancedMenuDialogTitle") dialog.setVisible(true) Select Case dialog.Execute() Case 1 @@ -95,7 +115,7 @@ Private Sub cleanAccordingTo(dialog As Object) statusIndicator.end() saveAndreload() - MsgBox getTranslation(lang,"cleaningFinished") + MsgBox getTranslation("cleaningFinished") End Sub @@ -145,7 +165,7 @@ Private Sub quietCleaning removeLibs statusIndicator.end() saveAndreload() - MsgBox getTranslation(lang,"cleaningFinished") + MsgBox getTranslation("cleaningFinished") End Sub Private Sub removeFirstElementPageBreak diff --git a/Redaction/CleaningDialog.xdl b/Redaction/CleaningDialog.xdl index f7462e6..2029993 100644 --- a/Redaction/CleaningDialog.xdl +++ b/Redaction/CleaningDialog.xdl @@ -1,24 +1,27 @@ - + - - - - - - - + + + + + + + - + - - - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/Redaction/Configuration.xba b/Redaction/Configuration.xba index c079437..b2a4e34 100644 --- a/Redaction/Configuration.xba +++ b/Redaction/Configuration.xba @@ -48,7 +48,7 @@ Private Sub configurationDialog Dim dialog As Object DialogLibraries.LoadLibrary("Redaction") dialog = CreateUnoDialog(DialogLibraries.Redaction.ConfigDialog) - loadConfigToDialog(dialog) + loadConfigToDialog(dialog) dialog.setVisible(true) Select Case dialog.Execute() Case 1 @@ -61,22 +61,19 @@ Private Sub configurationDialog End Sub Private Sub quietStartDialog - Globalscope.BasicLibraries.LoadLibrary( "Tools" ) Dim dialog As Object DialogLibraries.LoadLibrary("Redaction") dialog = CreateUnoDialog(DialogLibraries.Redaction.StartQuietCleaning) - Dim lang As String - lang = GetStarOfficeLocale().Language Dim description As String Dim buttonNameOk As String Dim buttonNameStop As String Dim buttonNameLoad As String Dim dialogTitle As String - description = getTranslation(lang,"startQuietCleaningDescription") - buttonNameOk = getTranslation(lang,"buttonOk") - buttonNameStop = getTranslation(lang,"buttonStop") - buttonNameLoad = getTranslation(lang,"buttonLoad") - dialogTitle = getTranslation(lang,"quietStartCleaningTitle") + description = getTranslation("startQuietCleaningDescription") + buttonNameOk = getTranslation("buttonYes") + buttonNameStop = getTranslation("buttonStop") + buttonNameLoad = getTranslation("buttonLoad") + dialogTitle = getTranslation("quietStartCleaningTitle") dialog.Title = dialogTitle dialog.getControl("Description").setText(description) dialog.getControl("buttonOk").Label = buttonNameOk @@ -101,16 +98,14 @@ Private Sub noStylesFileDialog Dim dialog As Object DialogLibraries.LoadLibrary("Redaction") dialog = CreateUnoDialog(DialogLibraries.Redaction.NoStyleFile) - Dim lang As String - lang = GetStarOfficeLocale().Language Dim description As String Dim buttonName As String Dim dialogTitle As String Dim buttonTemplateNotFoundSkip As String - dialogTitle = getTranslation(lang,"noStylesFileDialogTitle") - description = getTranslation(lang,"noFileWithStylesFound") - buttonName = getTranslation(lang,"buttonNameToSelectFileWithStyles") - buttonTemplateNotFoundSkip = getTranslation(lang,"buttonTemplateNotFoundSkip") + dialogTitle = getTranslation("noStylesFileDialogTitle") + description = getTranslation("noFileWithStylesFound") + buttonName = getTranslation("buttonNameToSelectFileWithStyles") + buttonTemplateNotFoundSkip = getTranslation("buttonTemplateNotFoundSkip") dialog.Title = dialogTitle dialog.getControl("Description").setText(description) dialog.getControl("FileSelection").Label = buttonName diff --git a/Redaction/Translations.xba b/Redaction/Translations.xba index 215ed22..9b0c0d8 100644 --- a/Redaction/Translations.xba +++ b/Redaction/Translations.xba @@ -1,7 +1,10 @@ -Function getTranslation(lang As String, identifier As String) As String +Function getTranslation(identifier As String) As String + Globalscope.BasicLibraries.LoadLibrary( "Tools" ) + Dim lang As String + lang = GetStarOfficeLocale().Language Select Case lang Case "ru" getTranslation = getRussian(identifier) @@ -13,75 +16,183 @@ Function getTranslation(lang As String, identifier As String) As String End Function Function getRussian(identifier As String) As String - Select Case identifier - Case "noFileWithStylesFound" - getRussian = "Файл-шаблон, содержащий стили для загрузки в документ не был задан. " & chr(10) &"Вы можете выбрать новый файл-шаблон. " & chr(10) & "Если файл-шаблон не будет выбран, то данный этап чистки будет пропущен." - Exit Function - Case "startQuietCleaningDescription" - getRussian = "Вы хотите запустить чистку документа? " & chr(10) & "Здесь Вы можете также указать новый файл-шаблон." & chr(10) & "Стили из шаблона будут загружены в документ." - Exit Function - Case "buttonOk" - getRussian = "Да" - Exit Function - Case "quietStartCleaningTitle" - getRussian = "Подтверждение запуска чистки" - Exit Function - Case "noStylesFileDialogTitle" - getRussian = "Файл со стилями не найден" - Exit Function - Case "buttonTemplateNotFoundSkip" - getRussian = "Продолжить" - Exit Function - Case "buttonStop" - getRussian = "Нет" - Exit Function - Case "buttonLoad" - getRussian = "Указать шаблон" - Exit Function + Select Case identifier + Case "noFileWithStylesFound" + getRussian = "Файл-шаблон, содержащий стили для загрузки в документ не был задан. " & chr(10) &"Вы можете выбрать новый файл-шаблон. " & chr(10) & "Если файл-шаблон не будет выбран, то данный этап чистки будет пропущен." + Exit Function + Case "startQuietCleaningDescription" + getRussian = "Вы хотите запустить чистку документа? " & chr(10) & "Здесь Вы можете также указать новый файл-шаблон." & chr(10) & "Стили из шаблона будут загружены в документ." + Exit Function + Case "buttonYes" + getRussian = "Да" + Exit Function + Case "quietStartCleaningTitle" + getRussian = "Подтверждение запуска чистки" + Exit Function + Case "noStylesFileDialogTitle" + getRussian = "Файл со стилями не найден" + Exit Function + Case "buttonTemplateNotFoundSkip" + getRussian = "Продолжить" + Exit Function + Case "buttonStop" + getRussian = "Нет" + Exit Function + Case "buttonLoad" + getRussian = "Указать шаблон" + Exit Function Case "buttonNameToSelectFileWithStyles" - getRussian = "Указать файл" - Exit Function + getRussian = "Указать файл" + Exit Function Case "cleaningFinished" - getRussian = "Чистка завершена" - Exit Function + getRussian = "Чистка завершена" + Exit Function + Case "advancedMenuDialogTitle" + getRussian = "Чистка в экспертном режиме " + Exit Function + Case "buttonCancel" + getRussian = "Отмена" + Exit Function + Case "buttonOK" + getRussian = "Запуск" + Exit Function + Case "advancedMenuRemoveBasic" + getRussian = "Удалить макросы из файла" + Exit Function + Case "advancedMenuRemoveManualPageBreaks" + getRussian = "Удалить ручные разрывы страниц" + Exit Function + Case "advancedMenuLoadStandardStyles" + getRussian = "Загрузить стили из шаблона" + Exit Function + Case "advancedMenuRemovePageStyles" + getRussian = "Удалить пользовательские стили страниц" + Exit Function + Case "advancedMenuRemoveInitPageBreak" + getRussian = "Удалить разрыв страницы в начале документа" + Exit Function + Case "advancedMenuFixMistakes" + getRussian = "Исправить часто встречающиеся ошибки" + Exit Function + Case "advancedMenuConfigAnchors" + getRussian = "Настроить привязки изображений для электронных публикаций" + Exit Function + Case "advancedMenuConfigTables" + getRussian = "Настроить таблицы для электронных публикаций" + Exit Function + Case "advancedMenuRemoveBookmarks" + getRussian = "Удалить закладки" + Exit Function + Case "advancedMenuRemoveLinks" + getRussian = "Удалить ссылки" + Exit Function + Case "advancedMenuRemoveUnusedStyles" + getRussian = "Удалить неиспользуемые стили" + Exit Function + Case "advancedMenuReplaceWhiteBackground" + getRussian = "Заменить белый фон символов на прозрачный" + Exit Function + Case "advancedMenuCleanFormatting" + getRussian = "Очистить форматирование" + Exit Function + Case "advancedMenuSymbolsConversion" + getRussian = "Произвести конвертацию символов" + Exit Function + Case "advancedMenuReplaceFontsInStyles" + getRussian = "Заменить шрифты стилях" + Exit Function Case Else - getRussian = getEnglish(identifier) + getRussian = "Перевод не найден" End Select End Function Function getEnglish(identifier As String) As String Select Case identifier - Case "noFileWithStylesFound" - getEnglish = "Template with styles wasn't found. You can choose template on your computer." & chr(10) &" This stage of cleaning will be skipped if no file chosen." - Exit Function - Case "startQuietCleaningDescription" - getEnglish = "Do you want to start document cleaning?" & chr(10) & "You can choose template with styles." & chr(10) & "Styles will be loaded in process of cleaning." - Exit Function - Case "noStylesFileDialogTitle" - getEnglish = "Template file not found" - Exit Function - Case "quietStartCleaningTitle" - getEnglish = "Confirmation" - Exit Function + Case "noFileWithStylesFound" + getEnglish = "Template with styles wasn't found. You can choose template on your computer." & chr(10) &" This stage of cleaning will be skipped if no file chosen." + Exit Function + Case "startQuietCleaningDescription" + getEnglish = "Do you want to start document cleaning?" & chr(10) & "You can choose template with styles." & chr(10) & "Styles will be loaded in process of cleaning." + Exit Function + Case "buttonYes" + getEnglish = "Ok" + Exit Function + Case "quietStartCleaningTitle" + getEnglish = "Confirmation" + Exit Function + Case "noStylesFileDialogTitle" + getEnglish = "Template file not found" + Exit Function Case "buttonTemplateNotFoundSkip" - getRussian = "Proceed" - Exit Function - Case "buttonOk" - getEnglish = "Ok" - Exit Function - Case "buttonStop" - getEnglish = "Cancel" - Exit Function - Case "buttonLoad" - getEnglish = "Set template" - Exit Function + getEnglish = "Proceed" + Exit Function + Case "buttonStop" + getEnglish = "Cancel" + Exit Function + Case "buttonLoad" + getEnglish = "Set template" + Exit Function Case "buttonNameToSelectFileWithStyles" - getEnglish = "Select file" - Exit Function + getEnglish = "Select file" + Exit Function Case "cleaningFinished" - getEnglish = "Cleaning is completed" - Exit Function + getEnglish = "Cleaning is completed" + Exit Function + Case "advancedMenuDialogTitle" + getEnglish = "Advanced cleaning" + Exit Function + Case "buttonCancel" + getEnglish = "Cancel" + Exit Function + Case "buttonOK" + getEnglish = "Start" + Exit Function + Case "advancedMenuRemoveBasic" + getEnglish = "Remove macro from file" + Exit Function + Case "advancedMenuRemoveManualPageBreaks" + getEnglish = "Remove manual page breaks" + Exit Function + Case "advancedMenuLoadStandardStyles" + getEnglish = "Load styles from template" + Exit Function + Case "advancedMenuRemovePageStyles" + getEnglish = "Remove custom page styles" + Exit Function + Case "advancedMenuRemoveInitPageBreak" + getEnglish = "Remove page break at document start" + Exit Function + Case "advancedMenuFixMistakes" + getEnglish = "Remove frequent mistakes" + Exit Function + Case "advancedMenuConfigAnchors" + getEnglish = "Configure image anchors for digital publications" + Exit Function + Case "advancedMenuConfigTables" + getEnglish = "Configure tables for digital publications" + Exit Function + Case "advancedMenuRemoveBookmarks" + getEnglish = "Remove bookmarks" + Exit Function + Case "advancedMenuRemoveLinks" + getEnglish = "Remove links" + Exit Function + Case "advancedMenuRemoveUnusedStyles" + getEnglish = "Remove unused styles" + Exit Function + Case "advancedMenuReplaceWhiteBackground" + getEnglish = "Replace white symbol back with transparent" + Exit Function + Case "advancedMenuCleanFormatting" + getEnglish = "Clean manual formatting" + Exit Function + Case "advancedMenuSymbolsConversion" + getEnglish = "Convert symbols" + Exit Function + Case "advancedMenuReplaceFontsInStyles" + getEnglish = "Replace fonts in styles" + Exit Function Case Else getEnglish = "No translation" End Select diff --git a/description.xml b/description.xml index 03fbe46..b6c84a1 100644 --- a/description.xml +++ b/description.xml @@ -3,7 +3,7 @@ xmlns:dep="http://openoffice.org/extensions/description/2006" xmlns:xlink="http://www.w3.org/1999/xlink"> - + Cleaning and validation documents for publishing in html and epub with pagination