Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: `(getURL "")` was not working with the `i18n` helper

This commit is contained in:
Robin Ward 2020-06-05 09:53:43 -04:00
parent be5974734d
commit a9def011d0
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/templates/dashboard_general.hbs
View File

@ -147,7 +147,7 @@
filters=trendingSearchFilters
isEnabled=logSearchQueriesEnabled
disabledLabel=trendingSearchDisabledLabel}}
{{html-safe (i18n "admin.dashboard.reports.trending_search.more" basePath=(get-url "/"))}}
{{html-safe (i18n "admin.dashboard.reports.trending_search.more" basePath=(base-url))}}
</div>
{{/if}}
</div>

1
app/assets/javascripts/discourse-common/addon/helpers/get-url.js
View File

@ -2,3 +2,4 @@ import { registerUnbound } from "discourse-common/lib/helpers";
import getUrl from "discourse-common/lib/get-url";
registerUnbound("get-url", value => getUrl(value));
registerUnbound("base-url", () => getUrl(""));

2
app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs
View File

@ -96,7 +96,7 @@
{{/tap-tile-grid}}
{{else}}
<div class="alert alert-info">{{html-safe (i18n "bookmarks.no_timezone" basePath=(get-url "/"))}}</div>
<div class="alert alert-info">{{html-safe (i18n "bookmarks.no_timezone" basePath=(base-uri))}}</div>
{{/if}}
</div>