Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
olleharstedt committed Aug 5, 2022
2 parents ae0d4f1 + d052ccb commit 826ecbb
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 4 additions & 0 deletions application/models/AdminTheme.php
Expand Up @@ -159,6 +159,10 @@ public function registerStylesAndScripts()
App()->getClientScript()->registerPackage('ckeditor'); //
App()->getClientScript()->registerPackage('ckeditoradditions'); // CKEDITOR in a global sope
App()->getClientScript()->registerPackage('modaleditor');
$dir = (getLanguageRTL(App()->getLanguage())) ? 'rtl' : 'ltr';
if ($dir == "rtl") {
App()->getClientScript()->registerPackage('bootstrap-rtl');
}
}

$aCssFiles = array();
Expand Down
2 changes: 1 addition & 1 deletion application/views/admin/export/spss_view.php
Expand Up @@ -103,7 +103,7 @@
<ol>
<li><?php eT("Download the data and the syntax file.");?></li>
<li><?php eT("Open the syntax file in SPSS in Unicode mode.");?></li>
<em><?php eT("The next step (editing the 'FILE=' line) is only necessary when you have selected a SPSS version without Python. If you selected the version for SPSS with the Python plugin / Essentials, just save the syntax and the data file in the same folder. The full path will be automatically detected when you run the syntax."); ?></em>
<em><?php eT("The next step (editing the 'FILE=' line) is only necessary when you have selected a SPSS version without Python. If you selected the version for SPSS with the Python plugin / Essentials, just save the syntax and the data file in the same folder. If you use Python 3 you need to edit the syntax file: replace the line 'begin program.' with 'begin program PYTHON3.'. The full path will be automatically detected when you run the syntax."); ?></em>
<li><?php echo sprintf(gT("Edit the line starting with %s and complete the filename with a full path to the downloaded data file."),"'FILE='");?></li>
<li><?php eT("Choose 'Run/All' from the menu to run the import.");?></li>
</ol>
Expand Down

0 comments on commit 826ecbb

Please sign in to comment.