Merge pull request #9613 from annando/issue-8605

Issue 8605: "show less" now displays "show less"
This commit is contained in:
Hypolite Petovan 2020-11-30 15:49:43 -05:00 committed by GitHub
commit fd8d9fc7d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 6767 additions and 6739 deletions

View file

@ -147,6 +147,7 @@ class ForumManager
'$link_desc' => DI::l10n()->t('External link to forum'), '$link_desc' => DI::l10n()->t('External link to forum'),
'$total' => $total, '$total' => $total,
'$visible_forums' => $visible_forums, '$visible_forums' => $visible_forums,
'$showless' => DI::l10n()->t('show less'),
'$showmore' => DI::l10n()->t('show more')] '$showmore' => DI::l10n()->t('show more')]
); );
} }

View file

@ -516,6 +516,7 @@ class Widget
'$cutoff' => $cutoff, '$cutoff' => $cutoff,
'$url' => $url, '$url' => $url,
'$dates' => $ret, '$dates' => $ret,
'$showless' => DI::l10n()->t('show less'),
'$showmore' => DI::l10n()->t('show more') '$showmore' => DI::l10n()->t('show more')
]); ]);

File diff suppressed because it is too large Load diff

View file

@ -2,11 +2,11 @@
function showHideDates() { function showHideDates() {
if( $('#posted-date-selector-drop').is(':visible')) { if( $('#posted-date-selector-drop').is(':visible')) {
$('#posted-date-selector-drop').hide(); $('#posted-date-selector-drop').hide();
$('#posted-date-collapse').html(window.showMore); $('#posted-date-collapse').html('{{$showmore}}');
} else { } else {
$('#posted-date-selector-drop').show(); $('#posted-date-selector-drop').show();
$('#posted-date-collapse').html(window.showFewer); $('#posted-date-collapse').html('{{$showless}}');
} }
} }
</script> </script>

View file

@ -2,12 +2,12 @@
function showHideForumlist() { function showHideForumlist() {
if( $("li[id^='forum-widget-entry-extended-']").is(':visible')) { if( $("li[id^='forum-widget-entry-extended-']").is(':visible')) {
$("li[id^='forum-widget-entry-extended-']").hide(); $("li[id^='forum-widget-entry-extended-']").hide();
$("li#forum-widget-collapse").html(window.showMore); $("li#forum-widget-collapse").html('{{$showmore}}');
} }
else { else {
$("li[id^='forum-widget-entry-extended-']").show(); $("li[id^='forum-widget-entry-extended-']").show();
$("li#forum-widget-collapse").html(window.showFewer); $("li#forum-widget-collapse").html('{{$showless}}');
} }
} }
</script> </script>

View file

@ -3,12 +3,12 @@
function showHideForumlist() { function showHideForumlist() {
if( $("li[id^='forum-widget-entry-extended-']").is(':visible')) { if( $("li[id^='forum-widget-entry-extended-']").is(':visible')) {
$("li[id^='forum-widget-entry-extended-']").hide(); $("li[id^='forum-widget-entry-extended-']").hide();
$("li#forum-widget-collapse").html(window.showMore); $("li#forum-widget-collapse").html('{{$showmore}}');
} }
else { else {
$("li[id^='forum-widget-entry-extended-']").show(); $("li[id^='forum-widget-entry-extended-']").show();
$("li#forum-widget-collapse").html(window.showFewer); $("li#forum-widget-collapse").html('{{$showless}}');
} }
} }
</script> </script>

View file

@ -3,14 +3,15 @@
function showHideForumlist() { function showHideForumlist() {
if( $("li[id^='forum-widget-entry-extended-']").is(':visible')) { if( $("li[id^='forum-widget-entry-extended-']").is(':visible')) {
$("li[id^='forum-widget-entry-extended-']").hide(); $("li[id^='forum-widget-entry-extended-']").hide();
$("li#forum-widget-collapse").html(window.showMore); $("li#forum-widget-collapse").html('{{$showmore}}');
} }
else { else {
$("li[id^='forum-widget-entry-extended-']").show(); $("li[id^='forum-widget-entry-extended-']").show();
$("li#forum-widget-collapse").html(window.showFewer); $("li#forum-widget-collapse").html('{{$showless}}');
} }
} }
</script> </script>
<div id="forumlist-sidebar-right" class="widget"> <div id="forumlist-sidebar-right" class="widget">