Squidly271/community.applications
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Languages wouldn't install from popup

Browse Source
This commit is contained in:
Squidly271 2021-02-27 09:52:37 -05:00
parent 60c675dfab
commit 6c8f896c1b
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
archive/community.applications-2021.02.27-x86_64-1.txz
View File

Binary file not shown.

6
source/community.applications/usr/local/emhttp/plugins/community.applications/CommunityApps.page
View File

@ -398,7 +398,6 @@ $(function(){
});
$('.mainArea').on("click",".languageInstall",function() {
if ( popupVisible(this) ) return;
installLanguage($(this).data("language_xml"),$(this).data("language"));
});
@ -1723,7 +1722,10 @@ function CAswitchLanguage(language) {
window.location.reload();
});
}
function installLanguage(languageURL,language) {
function installLanguage(languageURL,language,popup=false) {
if ( ! popup && popupVisible() ) return;
$(".tooltipstered").tooltipster("hide");
disableSearch();
openBox('/plugins/community.applications/scripts/languageInstall.sh&arg1=install&arg2='+languageURL,"<?tr('Install Language Pack')?>",600,900,true,"refreshDisplay");
}

6
source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/skin.php
View File

@ -638,11 +638,11 @@ function getPopupDescriptionSkin($appNumber) {
$installLine .= "<div><a class='ca_tooltip appIconsPopUp ca_fa-switchto' onclick=CAswitchLanguage('$countryCode');> {$template['SwitchLanguage']}</a></div>";
}
} else {
$installLine .= "<div><a class='ca_tooltip appIconsPopUp ca_fa-install languageInstall' onclick=installPlugin('{$template['TemplateURL']}');> {$template['InstallLanguage']}</a></div>";
$installLine .= "<div><a class='ca_tooltip appIconsPopUp ca_fa-install languageInstall' onclick='installLanguage(&quot;{$template['TemplateURL']}&quot;,&quot;$countryCode&quot;,true);'> {$template['InstallLanguage']}</a></div>";
}
if ( file_exists("/var/log/plugins/lang-$countryCode.xml") ) {
if ( languageCheck($template) ) {
$installLine .= "<div><a class='ca_tooltip appIconsPopUp ca_fa-update languageInstall' onclick=installPlugin('$countryCode');> {$template['UpdateLanguage']}</a></div>";
$installLine .= "<div><a class='ca_tooltip appIconsPopUp ca_fa-update languageInstall' data-languageonclick=installPlugin('$countryCode');> {$template['UpdateLanguage']}</a></div>";
}
}
if ( $countryCode !== "en_US" ) {
@ -1012,7 +1012,7 @@ function displayCard($template) {
</div>
<div class='ca_hr'></div>
<div class='ca_bottomLine'>
{$template['display_multi_install']}{$template['display_languageUpdate']}{$template['display_languageInstallIcon']}{$template['display_language_switch']}{$template['display_pluginInstallIcon']}{$template['display_dockerInstallIcon']} $dockerReinstall {$template['display_dockerReinstallIcon']} {$template['display_dockerEditIcon']} {$template['display_pluginSettingsIcon']}{$template['display_infoIcon']} {$template['dockerWebIcon']}{$template['display_profile']}{$template['display_webpage']}{$template['display_faSupport']}{$template['display_twitter']}{$template['display_reddit']}{$template['display_discord']}{$template['display_facebook']}{$template['display_faFavourite']} {$template['display_faProject']} {$template['display_pinButton']}{$template['display_favouriteButton']}{$template['display_repoSearch']}
{$template['display_multi_install']}{$template['display_languageUpdate']}{$template['display_languageInstallIcon']}{$template['display_language_switch']}{$template['display_pluginInstallIcon']}{$template['display_dockerInstallIcon']} $dockerReinstall {$template['display_dockerReinstallIcon']} {$template['display_dockerEditIcon']} {$template['display_pluginSettingsIcon']}{$template['display_infoIcon']} {$template['dockerWebIcon']}{$template['display_profile']}{$template['display_webpage']}{$template['display_faSupport']}{$template['display_twitter']}{$template['display_reddit']}{$template['display_discord']}{$template['display_facebook']} {$template['display_faProject']} {$template['display_pinButton']}{$template['display_repoSearch']}{$template['display_faFavourite']}{$template['display_favouriteButton']}
<span class='ca_bottomRight'>
{$template['display_removable']} {$template['display_Uninstall']}
</span>