mirrors/community.applications
1
0
Fork 0
mirror of https://github.com/Squidly271/community.applications.git synced 2025-06-03 14:52:13 +08:00
Code Issues Projects Releases Wiki Activity

Below:

Browse Source 
Handle a specific error in language translations.
Updated takes precedence over installed.
This commit is contained in:
Squidly271 2022-05-22 07:29:23 -04:00
parent c7707aee1a
commit 616fa509c9
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
archive/community.applications-2022.05.22-x86_64-1.txz Normal file
View File

Binary file not shown.

4
source/community.applications/usr/local/emhttp/plugins/community.applications/ca.md5
View File

@ -3,7 +3,7 @@ adf99b88870ea8f7dbb8f6960495fb57 ./Apps.page
42a1658a916a3a3eed2a9f2af80603c4 ./ca_settings.page 42a1658a916a3a3eed2a9f2af80603c4 ./ca_settings.page
e718d7825dbdc96a17a915079222b098 ./default.cfg e718d7825dbdc96a17a915079222b098 ./default.cfg
084221f469c97f34ed4e8576730ead78 ./include/exec.php 084221f469c97f34ed4e8576730ead78 ./include/exec.php
fb690feab69575af4da39d58a9e51340 ./include/helpers.php 443a7e01447411322b706390a18d2bd5 ./include/helpers.php
fc87642746ba4f324537bc381b78e982 ./include/paths.php fc87642746ba4f324537bc381b78e982 ./include/paths.php
532fffdf939594c143e679da02bd841e ./javascript/libraries.js 532fffdf939594c143e679da02bd841e ./javascript/libraries.js
71f911a818d88d3d567f8a2898094ee2 ./README.md 71f911a818d88d3d567f8a2898094ee2 ./README.md
@ -21,4 +21,4 @@ da3b4f9b73c5c3bf65be6c42d68b51f9 ./scripts/showStatistics.php
34554a56611dfe625889c82afd5138de ./scripts/updatePluginSupport.php 34554a56611dfe625889c82afd5138de ./scripts/updatePluginSupport.php
ce8e45452d3b63b5943b6f39c817bbf9 ./skins/Narrow/css.php ce8e45452d3b63b5943b6f39c817bbf9 ./skins/Narrow/css.php
c4d6ce8de3baff1c9de2b7f348b2f340 ./skins/Narrow/skin.html c4d6ce8de3baff1c9de2b7f348b2f340 ./skins/Narrow/skin.html
3ee5f4855b7eacfdcc9cf107d0af2428 ./skins/Narrow/skin.php 21a0c78b29b87cac7c2ae06f15eebaa2 ./skins/Narrow/skin.php

3
source/community.applications/usr/local/emhttp/plugins/community.applications/include/helpers.php
View File

@ -567,6 +567,9 @@ function postReturn($retArray) {
if ( ! function_exists("tr") ) { if ( ! function_exists("tr") ) {
function tr($string,$options=-1) { function tr($string,$options=-1) {
$translated = _($string,$options); $translated = _($string,$options);
if ( ! trim($translated) )
$translated = $string;
if ( startsWith($translated,""") && endsWith($translated,""") ) if ( startsWith($translated,""") && endsWith($translated,""") )
$translated = first_str_replace(last_str_replace($translated,""",""),""",""); $translated = first_str_replace(last_str_replace($translated,""",""),""","");

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

@ -1198,7 +1198,12 @@ function displayCard($template) {
$flagTextStart = " "; $flagTextStart = " ";
$flagTextEnd = " "; $flagTextEnd = " ";
} }
if ( ($Installed || $Uninstall) && !$actionCentre) { if ( $UpdateAvailable ) {
$card .= "
<div class='betaCardBackground'>
<div class='installedCardText ca_center'>".tr("UPDATED")."</div>
</div>";
} elseif ( ($Installed || $Uninstall) && !$actionCentre) {
$card .= " $card .= "
<div class='installedCardBackground'> <div class='installedCardBackground'>
<div class='installedCardText ca_center'>".tr("INSTALLED")."</div> <div class='installedCardText ca_center'>".tr("INSTALLED")."</div>
@ -1228,11 +1233,6 @@ function displayCard($template) {
<div class='betaPopupText ca_center' title='".tr("This application template has been deprecated")."'>".tr("Deprecated")."$flagTextEnd</div> <div class='betaPopupText ca_center' title='".tr("This application template has been deprecated")."'>".tr("Deprecated")."$flagTextEnd</div>
</div> </div>
"; ";
} elseif ( $UpdateAvailable ) {
$card .= "
<div class='betaCardBackground'>
<div class='installedCardText ca_center'>".tr("UPDATED")."</div>
</div>";
} elseif ( $Official ) { } elseif ( $Official ) {
$card .= " $card .= "
<div class='officialCardBackground'> <div class='officialCardBackground'>