[Scummvm-git-logs] scummvm-web master -> 6aacaeb919721c20f7071ee76333c14d122522d5

Wed Jan 23 01:58:22 CET 2019

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm-web' repo located at https://github.com/scummvm/scummvm-web .

Summary:
de96e75852 I18N: Fix I18N generation
6aacaeb919 WEB: Temporarily disable cookie check


Commit: de96e75852fb2ffa20e2a726b56ced4ee8713e03
    https://github.com/scummvm/scummvm-web/commit/de96e75852fb2ffa20e2a726b56ced4ee8713e03
Author: Matan Bareket (mataniko at gmail.com)
Date: 2019-01-22T19:55:17-05:00

Commit Message:
I18N: Fix I18N generation

Changed paths:
    include/I18N.php

diff --git a/include/I18N.php b/include/I18N.php
index c4d6ae0..fa6fa0f 100644
--- a/include/I18N.php
+++ b/include/I18N.php
@@ -6,7 +6,7 @@ require_once __DIR__ . '/../vendor/autoload.php';
 use ScummVM\Objects\News;
 use ScummVM\Models\NewsModel;
 
-// define('DIR_NEWS', 'data/news');
+define('DIR_NEWS', 'data/news');
 
 class I18N
 {


Commit: 6aacaeb919721c20f7071ee76333c14d122522d5
    https://github.com/scummvm/scummvm-web/commit/6aacaeb919721c20f7071ee76333c14d122522d5
Author: Matan Bareket (mataniko at gmail.com)
Date: 2019-01-22T19:58:10-05:00

Commit Message:
WEB: Temporarily disable cookie check

Changed paths:
    templates/pages/index.tpl


diff --git a/templates/pages/index.tpl b/templates/pages/index.tpl
index a3e5b77..77fe189 100644
--- a/templates/pages/index.tpl
+++ b/templates/pages/index.tpl
@@ -7,7 +7,7 @@
 	<base href="{$baseurl}">
 	{* Cache bust CSS if making major changes *}
 	{$css = "2.0.0"}
-	<link rel="stylesheet" href="{$baseurl}css/main.css?v={$css}">	
+	<link rel="stylesheet" href="{$baseurl}css/main.css?v={$css}">
 	{* Page specific, or other extra CSS rules. *}
 	{foreach from=$css_files item=filename}
 	<link rel="stylesheet" href="{$baseurl}css/{$filename}">
@@ -16,7 +16,7 @@
 	<link rel="alternate" type="application/rss+xml" title="{#indexRSSFeed#}" href="{$baseurl}feeds/rss/">
 	<link rel="apple-touch-icon" href="/images/scummvm.png">
 	<title>ScummVM :: {$title}</title>
-	{if $smarty.cookies.cookie_consent == "true"}
+	<!-- {if $smarty.cookies.cookie_consent == "true"} -->
 		<!-- Matomo -->
 		<script type="text/javascript">
 		var _paq = _paq || [];
@@ -34,7 +34,7 @@
 		</script>
 		<noscript><p><img src="https://analytics.scummvm.org/piwik.php?idsite=1&rec=1" style="border:0;" alt="" /></p></noscript>
 		<!-- End Matomo Code -->
-	{/if}
+	<!-- {/if} -->
 </head>
 <body>
 	<input type="checkbox" autocomplete="off" id="nav-trigger" class="nav-trigger" />
@@ -48,13 +48,13 @@
 					<a href="{$baseurl}">
 						<img class="foreground" src="/images/scummvm_logo.png" alt="{#indexLogo#}">
 					</a>
-			</div>			
+			</div>
 			<div class="row top">
 				<div class="col-1-1">
 					<img class="heroes hide-small" src="/images/heroes{$heroes_num|rand:0}.png" alt="{#indexCharacters#}">
 				</div>
 			</div>
-			<div class="row bottom hide-small">			
+			<div class="row bottom hide-small">
 				<div class="col-1-1">
 					<span class="scummvm float_right">Script Creation Utility for Maniac Mansion Virtual Machine</span>
 				</div>
@@ -115,19 +115,19 @@
 				document.body.classList.remove('no-scroll');
 		});
 	</script>
-	{if $smarty.cookies.cookie_consent == "true"}
+	<!-- {if $smarty.cookies.cookie_consent == "true"} -->
 		{* Google analytics javascript. *}
 			<script src="https://www.google-analytics.com/urchin.js" type="text/javascript"></script>
 			<script type="text/javascript">
 				_uacct = "UA-1455743-1";
-				_udn = "scummvm.org";		
-				urchinTracker();				
+				_udn = "scummvm.org";
+				urchinTracker();
 			</script>
 		{* End Google analytics javascript. *}
-	{else if $smarty.cookies.cookie_consent == "false"}
+	<!-- {else if $smarty.cookies.cookie_consent == "false"}
 		{* Do nothing *}
 	{else}
-		{include file='components/cookie.tpl'}	
-	{/if}
+		{include file='components/cookie.tpl'}
+	{/if} -->
 	</body>
 </html>



