diff --git a/controller/action/DownloadActions.class.php b/controller/action/DownloadActions.class.php index dd315a68..bf3c55fc 100644 --- a/controller/action/DownloadActions.class.php +++ b/controller/action/DownloadActions.class.php @@ -22,11 +22,12 @@ class DownloadActions extends Actions public static function executeGet() { $email = static::param('e'); + $user = []; + if ($email) { $emailIsValid = filter_var($email, FILTER_VALIDATE_EMAIL); - $user = []; if ($emailIsValid) { $user = Prefinery::findUser($email); diff --git a/data/i18n/en.yaml b/data/i18n/en.yaml index b6c66a20..a2acef52 100644 --- a/data/i18n/en.yaml +++ b/data/i18n/en.yaml @@ -6,7 +6,7 @@ # age settings are set to English, and the same label renders as "Assista, Compa # rtilhe, Ganhe" if the user's settings are set to Portuguese. # -# +# description: allowed: Download/install the latest version of LBRY for %os%. @@ -18,7 +18,7 @@ description: news: Access information and content in ways you never dreamed possible. Earn credits for your unused bandwidth and diskspace. no-os: Download or install the latest version of LBRY. press: LBRY Press Kit. Information and media for those who want to report on LBRY. - publish: Publish your content on the world's first platform that leaves creators in control. + publish: Publish your content on the world's first platform that leaves creators in control. team: LBRY is founded by a team passionate about connecting producers and consumers and breaking down broken models. Learn more about them. test: WHAT WHAT what: Access information and content in ways you never dreamed possible. Earn credits for your unused bandwidth and diskspace. @@ -31,11 +31,10 @@ download: earn1: Earn # this many credits earn2: for completing the survey below after install. - email1: After download, use email + email1: After download, use email email2: and the code you received via email to receive your credits. email3: If you received a printed code and it does not work after you download, check your email for a different code. - for-os1: Download/install the latest version of LBRY for %os%. - for-os2: "" + for-os: LBRY for %os% github: Or, view the source and compile instructions on osx: Arrival is expected by July 5. osx2: Download for OS X @@ -47,7 +46,6 @@ download: verb: Download windows: Arrival is expected this month. works: "Works with Ubuntu, Debian, or any distro with apt or dpkg." - worth: "*What is this worth? Who knows! But it is the largest reward we will ever offer to early adopters." email: address: Email code: Invite Code @@ -109,15 +107,9 @@ page: # This might be the case if required by the syntax of the translated languag # e. more: more on referrals + referone: 1 LBRYian has joined because of you. + refermany: %count% LBRYians have joined because of you. status: Your Sharing Status - # status1, status2 and status3 form a single sentence. status1 is blank in E - # nglish, might not be in the translated language. - status1: "" - # this many people - status2: LBRYians - # status1 and status2 are the subject of the sentence and are written in bol - # d, hence the separation between them and the rest. - status3: have joined because of you. zero: Zero notfound: Page Not Found team: @@ -125,7 +117,7 @@ page: alex: parag1: Alex Tabarrok is Bartley J. Madden Chair in Economics at the Mercatus Center and a professor of economics at George Mason University. He specializes in intellectual property reform, the effectiveness of markets, and the justice system. parag2: Tabarrok is the coauthor, with Mercatus colleague Tyler Cowen, of the popular economics blog Marginal Revolution and cofounder of the online educational platform Marginal Revolution University. He is the coauthor of Modern Principles of Economics, and author of the recent book Launching the Innovation Renaissance. His articles have appeared in the New York Times, the Washington Post, the Wall Street Journal, and many other prestigious publications. - parag3: Tabarrok received his PhD in economics from George Mason University. + parag3: Tabarrok received his PhD in economics from George Mason University. title: Economic Advisor grin: parag1: One of Alex's job titles is Wizard, so named because he can seemingly understand and utilize new technologies faster than they can be created. diff --git a/view/template/download/_feedbackPrompt.php b/view/template/download/_feedbackPrompt.php deleted file mode 100644 index 03ff7591..00000000 --- a/view/template/download/_feedbackPrompt.php +++ /dev/null @@ -1,8 +0,0 @@ - -

- {{download.earn1}} * {{download.earn2}} -

-
- {{download.worth}} -
- diff --git a/view/template/download/_refer.php b/view/template/download/_refer.php index 0d1f7707..c484f33f 100644 --- a/view/template/download/_refer.php +++ b/view/template/download/_refer.php @@ -9,7 +9,9 @@

{{page.refer.status}}

-

{{page.refer.status1}} {{page.refer.status2}} {{page.refer.status3}} +

$prefineryUser['share_signups_count']]) ?> +

-

{{download.for-os}}LBRY for {{download.for-os2}}

+

$osTitle]) ?>

{{download.verb}}