Compare commits

...
Author SHA1 Message Date
netop://ウエハ 15b1ec70db Updated video 2019-09-05 21:37:37 -05:00
netop://ウエハ 2d6f3074f1 Updated video 2019-09-05 18:01:14 -05:00
Jeremy Kauffman f40ce4a86c source translation files from lbry.com 2019-09-05 17:45:05 -04:00
Thomas Zarebczan 3f90ea07b4 update gif + update to neutral creator 2019-09-05 13:27:49 -04:00
Alex Grin ac37f8e49c Update canary.php 2019-09-03 14:27:34 -04:00
Jeremy Kauffman 06738ed3b1 gender neutral copy 2019-09-03 13:43:15 -04:00
netop://ウエハ 00f7bfc251 Closes #1096 (#1106) 2019-09-03 13:39:57 -04:00
Jeremy Kauffman d48aad8426 y is a vowel 2019-09-03 13:06:27 -04:00
Thomas Zarebczan 7adcd311bf update rob > brinck 2019-09-03 12:49:53 -04:00
Julie Sigwart 2b9c406294 Update _footer.php 2019-08-29 15:28:14 -07:00
16 changed files with 66 additions and 34 deletions

No files matched your search

+1
View File
@@ -7,6 +7,7 @@
"ext-xml": "*",
"ext-pdo": "*",
"ext-pdo_mysql": "*",
"ext-json": "*",
"leafo/scssphp": "0.7.6",
"erusev/parsedown": "^1.6",
"erusev/parsedown-extra": "^0.7.1",
Generated
+19 -18
View File
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "de5f8449179c92b9416b62185db66c94",
"content-hash": "4df89eeabf27a1fde648e75d29109826",
"packages": [
{
"name": "erusev/parsedown",
@@ -200,16 +200,16 @@
},
{
"name": "pelago/emogrifier",
"version": "v2.1.1",
"version": "v2.2.0",
"source": {
"type": "git",
"url": "https://github.com/MyIntervals/emogrifier.git",
"reference": "8ee7fb5ad772915451ed3415c1992bd3697d4983"
"reference": "2472bc1c3a2dee8915ecc2256139c6100024332f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/8ee7fb5ad772915451ed3415c1992bd3697d4983",
"reference": "8ee7fb5ad772915451ed3415c1992bd3697d4983",
"url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/2472bc1c3a2dee8915ecc2256139c6100024332f",
"reference": "2472bc1c3a2dee8915ecc2256139c6100024332f",
"shasum": ""
},
"require": {
@@ -227,7 +227,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.1.x-dev"
"dev-master": "3.0.x-dev"
}
},
"autoload": {
@@ -240,16 +240,6 @@
"MIT"
],
"authors": [
{
"name": "John Reeve",
"email": "jreeve@pelagodesign.com"
},
{
"name": "Cameron Brooks"
},
{
"name": "Jaime Prado"
},
{
"name": "Oliver Klee",
"email": "github@oliverklee.de"
@@ -258,9 +248,19 @@
"name": "Zoli Szabó",
"email": "zoli.szabo+github@gmail.com"
},
{
"name": "John Reeve",
"email": "jreeve@pelagodesign.com"
},
{
"name": "Jake Hotson",
"email": "jake@qzdesign.co.uk"
},
{
"name": "Cameron Brooks"
},
{
"name": "Jaime Prado"
}
],
"description": "Converts CSS styles into inline style attributes in your HTML code",
@@ -270,7 +270,7 @@
"email",
"pre-processing"
],
"time": "2018-12-10T10:36:30+00:00"
"time": "2019-09-04T16:07:59+00:00"
},
{
"name": "symfony/css-selector",
@@ -338,7 +338,8 @@
"ext-mbstring": "*",
"ext-xml": "*",
"ext-pdo": "*",
"ext-pdo_mysql": "*"
"ext-pdo_mysql": "*",
"ext-json": "*"
},
"platform-dev": []
}
+1 -1
View File
@@ -8,7 +8,7 @@ The very first question of newcomers is often, "How do you pronounce it?" Answer
"Is it an acronym?" No.
"Then why confuse people with the all-caps and no vowels?"
"Then why confuse people with the all-caps and removed vowels?"
First and foremost, LBRY is an internet protocol, just like HTTP. Content on LBRY is served to users via "LBRY names," which look like this: lbry://itsawonderfullife. Very similar to the URL you type into your internet browser. LBRY is not just our branded name, but the character string we've chosen to lead our URIs (Uniform Resource Identifier).
+2 -1
View File
@@ -137,10 +137,11 @@ class Controller
$router->get('/follow/{claim}', 'AcquisitionActions::executeFollowCampaign');
$router->get('/i18n/get/{project}/{resource}/{language}.json', 'i18nActions::executeServeTranslationFile');
$router->get('/news/category/{category}', 'ContentActions::executePostCategoryFilter');
$router->post('/set-culture', 'i18nActions::setCulture');
$router->post('/i18n/set-culture', 'i18nActions::setCulture');
$permanentRedirectsPath = ROOT_DIR . '/data/redirect/permanent.yaml';
$tempRedirectsPath = ROOT_DIR . '/data/redirect/temporary.yaml';
+9
View File
@@ -22,4 +22,13 @@ class i18nActions extends Actions
return Controller::redirect(Request::getReferrer());
}
public static function executeServeTranslationFile(string $project, string $resource, string $language)
{
if (!Transifex::isConfigured()) {
throw new Exception('Please set Config::TRANSIFEX_API_KEY in your configuration.');
}
return View::renderJson(Transifex::getTranslationResourceFile($project, $resource, $language));
}
}
+1
View File
@@ -12,4 +12,5 @@ $config = [];
// $config[Config::MAILCHIMP_KEY] = '';
// $config[Config::AWS_LOG_ACCESS_KEY] = '';
// $config[Config::AWS_LOG_SECRET_KEY] = '';
// $config[Config::TRANSIFEX_API_KEY] = '';
return $config;
+18
View File
@@ -0,0 +1,18 @@
<?php
class Transifex
{
public static function isConfigured() {
return (boolean)Config::get(Config::TRANSIFEX_API_KEY);
}
public static function getTranslationResourceFile($project, $resource, $language)
{
$url = "https://www.transifex.com/api/2/project/$project/resource/$resource/translation/$language?file=1";
return json_decode(CurlWithCache::get($url, [], [
'password' => 'api:' . Config::get(Config::TRANSIFEX_API_KEY),
'cache' => 1000 * 60 * 60 * 8
]), true);
}
}
+1
View File
@@ -15,6 +15,7 @@ class Config
const GITHUB_PERSONAL_AUTH_TOKEN = 'github_personal_auth_token';
const LBRY_API_SERVER = "lbry_api_server";
const MAILCHIMP_KEY = "mailchimp_key";
const TRANSIFEX_API_KEY = 'transifex_api_key';
const AWS_LOG_ACCESS_KEY = "aws_log_access_key";
const AWS_LOG_SECRET_KEY = "aws_log_secret_key";
const MAILGUN_API_KEY = "mailgun_api_key";
@@ -46,7 +46,7 @@
<h3>Step 2: Search and Follow <?php echo $claim['name'] ?></h3>
<p>Type <?php echo $claim['name'] ?> in the search bar and then click Follow.</p>
<div class="align-text--center" style="margin-top: 1rem; margin-bottom: 1rem;">
<img src="https://spee.ch/1/dynamic-searchfollow.gif" alt="How to follow <?php echo $claim['name'] ?> on LBRY" />
<img src="https://spee.ch/e/follow-1.gif" alt="How to follow <?php echo $claim['name'] ?> on LBRY" />
</div>
<p>If you provide your email address, you'll be notified about every new video.</p>
</div>
@@ -55,11 +55,11 @@
<section>
<div class="inner-wrap">
<h3>Step 3 (Optional): Support <?php echo $claim['name'] ?></h3>
<p>Use the Tip button to support <?php echo $claim['name'] ?> and help others discover his content.</p>
<p>Use the Tip button to support <?php echo $claim['name'] ?> and help others discover this content.</p>
<p>If you verify your account, you'll receive free credits that you can send to <?php echo $claim['name'] ?> or other creators.</p>
<small><em>Having trouble?</em> Read <a href="/faq/rewards">the rewards FAQ</a> for help.</small>
<div class="align-text--center" style="margin-top: 1rem; margin-bottom: 1rem;">
<img src="https://spee.ch/1/dynamic-tip.png" alt="How to support <?php echo $claim['name'] ?> on LBRY" />
<img src="https://spee.ch/9/follow-tip.png" alt="How to support <?php echo $claim['name'] ?> on LBRY" />
</div>
</div>
<br/>
+3 -3
View File
@@ -228,9 +228,9 @@
</figure>
<info>
<h3>Rob Smith</h3>
<p>Head of Product Growth</p>
<a href="mailto:rob@lbry.com?subject=YouTube+Freedom">Contact</a>
<h3>Brinck Slattery</h3>
<p>Director of Communications</p>
<a href="mailto:brinck@lbry.com?subject=YouTube+Freedom">Contact</a>
</info>
</div>
</div>
+2 -2
View File
@@ -49,8 +49,8 @@
playsinline
style="display: block; margin-right: auto; margin-left: auto; max-width: 700px; "
>
<source src="https://spee.ch/a/2019-08-lbry-interface-webm.webm" type="video/webm"/>
<source src="https://spee.ch/4/2019-08-lbry-interface.mp4" type="video/mp4"/>
<source src="https://spee.ch/b/2019-09-lbry-interface-webm-2.webm" type="video/webm"/>
<source src="https://spee.ch/0/2019-09-lbry-interface-mp4-2.mp4" type="video/mp4"/>
</video>
<?php endif ?>
+1 -1
View File
@@ -10,7 +10,7 @@
</section>
<section>
<div class="inner-wrap">
<div class="inner-wrap" style="position: relative;">
<?php echo View::render('mail/_settingsForm', [
'tags' => $tags,
'emails' => $emails,
+1 -1
View File
@@ -33,7 +33,7 @@
<li><a href="mailto:hello@lbry.com" title="Send us an email!">hello@lbry.com</a></li>
<li><a href="/contact" title="Send us an email!">Contact</a></li>
<li><a href="/privacypolicy" title="View our Privacy Policy">Privacy</a></li>
<li><a href="/termsofservice" title="Terms of Service"></a></li>
<li><a href="/termsofservice" title="Terms of Service">TOS</a></li>
<li><a href="/faq" title="Frequently Asked Questions about LBRY">FAQ</a></li>
</ul>
</div>
+1 -1
View File
@@ -24,7 +24,7 @@
</div>
<?php /*
<div class="control-item no-label-desktop">
<form action="/set-culture" method="POST">
<form action="/i18n/set-culture" method="POST">
<select id="language-dropdown" name="culture">
<?php foreach ($cultures as $culture): ?>
<option value="<?php echo $culture ?>" <?php echo $culture == $selectedCulture ? 'selected="selected"' : '' ?>>
+1 -1
View File
@@ -9,7 +9,7 @@
<section>
<div class="inner-wrap">
<p>Through June 1st, 2019, LBRY has received:</p>
<p>Through September 1st, 2019, LBRY has received:</p>
<ul>
<li>Zero National Security Letters</li>
+2 -2
View File
@@ -21,8 +21,8 @@
poster="https://spee.ch/f/2019-08-lbry-interface-poster.jpg"
playsinline
>
<source src="https://spee.ch/a/2019-08-lbry-interface-webm.webm" type="video/webm"/>
<source src="https://spee.ch/4/2019-08-lbry-interface.mp4" type="video/mp4"/>
<source src="https://spee.ch/b/2019-09-lbry-interface-webm-2.webm" type="video/webm"/>
<source src="https://spee.ch/0/2019-09-lbry-interface-mp4-2.mp4" type="video/mp4"/>
</video>
</a>
</figure>