Merge pull request #394 from tmiland/contrib

Add current branch to footer
This commit is contained in:
Omar Roth 2019-03-03 21:41:03 -06:00 committed by GitHub
commit 5895604282
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 3 deletions

View file

@ -92,6 +92,7 @@ PUBSUB_URL = URI.parse("https://pubsubhubbub.appspot.com")
TEXTCAPTCHA_URL = URI.parse("http://textcaptcha.com/omarroth@hotmail.com.json") TEXTCAPTCHA_URL = URI.parse("http://textcaptcha.com/omarroth@hotmail.com.json")
CURRENT_COMMIT = `git rev-list HEAD --max-count=1 --abbrev-commit`.strip CURRENT_COMMIT = `git rev-list HEAD --max-count=1 --abbrev-commit`.strip
CURRENT_VERSION = `git describe --tags $(git rev-list --tags --max-count=1)`.strip CURRENT_VERSION = `git describe --tags $(git rev-list --tags --max-count=1)`.strip
CURRENT_BRANCH = `git status | head -1`.strip
LOCALES = { LOCALES = {
"ar" => load_locale("ar"), "ar" => load_locale("ar"),
@ -135,6 +136,7 @@ if config.statistics_enabled
"software" => { "software" => {
"name" => "invidious", "name" => "invidious",
"version" => "#{CURRENT_VERSION}-#{CURRENT_COMMIT}", "version" => "#{CURRENT_VERSION}-#{CURRENT_COMMIT}",
"branch" => "#{CURRENT_BRANCH}",
}, },
"openRegistrations" => config.registration_enabled, "openRegistrations" => config.registration_enabled,
"usage" => { "usage" => {

View file

@ -107,19 +107,29 @@
<%= translate(locale, "Released under the AGPLv3 by Omar Roth.") %> <%= translate(locale, "Released under the AGPLv3 by Omar Roth.") %>
</a> </a>
</div> </div>
<div class="pure-u-1 pure-u-md-1-3"><%= translate(locale, "BTC: ") %>356DpZyMXu6rYd55Yqzjs29n79kGKWcYrY</div>
<div class="pure-u-1 pure-u-md-1-3"><%= translate(locale, "BCH: ") %>qq4ptclkzej5eza6a50et5ggc58hxsq5aylqut2npk</div>
<div class="pure-u-1 pure-u-md-1-3"> <div class="pure-u-1 pure-u-md-1-3">
<i class="icon ion-logo-bitcoin"></i>
<%= translate(locale, "BTC: ") %>356DpZyMXu6rYd55Yqzjs29n79kGKWcYrY</div>
<div class="pure-u-1 pure-u-md-1-3">
<i class="icon ion-logo-bitcoin"></i>
<%= translate(locale, "BCH: ") %>qq4ptclkzej5eza6a50et5ggc58hxsq5aylqut2npk</div>
<div class="pure-u-1 pure-u-md-1-3">
<i class="icon ion-logo-usd"></i>
<a href="https://liberapay.com/omarroth"><%= translate(locale, "Liberapay") %></a> <a href="https://liberapay.com/omarroth"><%= translate(locale, "Liberapay") %></a>
/ /
<a href="https://patreon.com/omarroth"><%= translate(locale, "Patreon") %></a> <a href="https://patreon.com/omarroth"><%= translate(locale, "Patreon") %></a>
</div> </div>
<div class="pure-u-1 pure-u-md-1-3"> <div class="pure-u-1 pure-u-md-1-3">
<i class="icon ion-logo-javascript"></i>
<a rel="jslicense" href="/licenses"> <a rel="jslicense" href="/licenses">
<%= translate(locale, "View JavaScript license information.") %> <%= translate(locale, "View JavaScript license information.") %>
</a> </a>
</div> </div>
<div class="pure-u-1 pure-u-md-1-3"><%= translate(locale, "Current version: ") %> <%= CURRENT_VERSION %>-<%= CURRENT_COMMIT %></div> <div class="pure-u-1 pure-u-md-1-3">
<i class="icon ion-logo-github"></i>
<%= translate(locale, "Current version: ") %> <%= CURRENT_VERSION %>-<%= CURRENT_COMMIT %>
<i class="icon ion-logo-github"></i>
<%= CURRENT_BRANCH %></div>
</div> </div>
</div> </div>
</div> </div>