Credit jquery.i18n in footer

Track which Massviews sources are used the most
MusikAnimal · Mar 7, 2017 · c70fcd7 · c70fcd7
1 parent debb4d3
commit c70fcd7
Show file tree

Hide file tree

Showing 14 changed files with 29,026 additions and 138 deletions.
diff --git a/javascripts/massviews/massviews.js b/javascripts/massviews/massviews.js
@@ -89,7 +89,7 @@ class MassViews extends mix(Pv).with(ChartHelpers, ListHelpers) {
    * @param  {Object} node - HTML element of the selected source
    */
   updateSourceInput(node) {
-    const source = node.dataset.value;
+    const source = this.source = node.dataset.value;
 
     $('#source_button').data('value', source).html(`${node.textContent} <span class='caret'></span>`);
 

diff --git a/javascripts/shared/pv.js b/javascripts/shared/pv.js
@@ -1158,12 +1158,18 @@ class Pv extends PvConfig {
 
     if (langApps.includes(this.project)) project = i18nLang;
 
+    let data =  {
+      app: this.app + (location.pathname.includes('-test') ? '-test' : ''),
+      project
+    };
+
+    if (this.app === 'massviews') {
+      data.source = this.source;
+    }
+
     $.ajax({
       url: '/pageviews/meta/api.php',
-      data: {
-        app: this.app + (location.pathname.includes('-test') ? '-test' : ''),
-        project
-      },
+      data,
       method: 'POST'
     });
   }

diff --git a/messages/en.json b/messages/en.json
@@ -302,7 +302,7 @@
 	"total-pageviews": "Pages by total number of pageviews",
 	"totals": "Totals",
 	"transclusions": "Transclusions",
-	"translation-credits": "Translations powered by $1 and $2.",
+	"translation-credits": "Translations powered by $1, $2 and $3.",
 	"tu": "Tu",
 	"unique-devices": "Unique devices",
 	"unique-editors": "Unique editors",

diff --git a/public_html/_footer.php b/public_html/_footer.php
@@ -31,18 +31,19 @@
     <?php $MusikAnimal = "<a href='https://en.wikipedia.org/wiki/User:MusikAnimal'>MusikAnimal</a>"; ?>
     <?php $Kaldari = "<a href='https://en.wikipedia.org/wiki/User:Kaldari'>Kaldari</a>"; ?>
     <?php $MarcelRuizForns = "<a href='https://en.wikipedia.org/wiki/User:Mforns_(WMF)'>Marcel Ruiz Forns</a>"; ?>
-    <?php echo $I18N->msg( 'credits', array( 'variables' => array( $MusikAnimal, $Kaldari, $MarcelRuizForns ), 'parsemag' => true ) );; ?>
+    <?php echo $I18N->msg( 'credits', [ 'variables' => [ $MusikAnimal, $Kaldari, $MarcelRuizForns ], 'parsemag' => true ] );; ?>
   </span>
   <div>
     <span class="nowrap">
       <?php $heart = "<span class='heart'>&hearts;</span>"; ?>
       <?php $host = "<a href='https://wikitech.wikimedia.org/wiki/Portal:Tool_Labs'>" . $I18N->msg( 'tool-labs' ) . "</a>"; ?>
-      <?php echo $I18N->msg( 'hosted', array( 'variables' => array( $heart, $host ), 'parsemag' => true ) );; ?>
+      <?php echo $I18N->msg( 'hosted', [ 'variables' => [ $heart, $host ], 'parsemag' => true ] );; ?>
     </span>
     <span class="nowrap">
       <?php $translateWiki = "<a href='https://translatewiki.net/'>translatewiki.net</a>"; ?>
+      <?php $jqueryI18n = "<a href='https://github.com/wikimedia/jquery.i18n'>jQuery.i18n</a>"; ?>
       <?php $intuition = "<a href='https://tools.wmflabs.org/intuition/#tab-about'>Intuition</a>"; ?>
-      <?php echo $I18N->msg( 'translation-credits', array( 'variables' => array( $translateWiki, $intuition ), 'parsemag' => true ) ); ?>
+      <?php echo $I18N->msg( 'translation-credits', [ 'variables' => [ $translateWiki, $jqueryI18n, $intuition ], 'parsemag' => true ] ); ?>
     </span>
   </div>
   <div>

diff --git a/public_html/application.js b/public_html/application.js
diff --git a/public_html/langviews/application.js b/public_html/langviews/application.js
diff --git a/public_html/massviews/application.js b/public_html/massviews/application.js
diff --git a/public_html/meta/api.php b/public_html/meta/api.php
@@ -54,8 +54,8 @@
 $exists_sql = "SELECT * FROM " . $app . "_projects WHERE project = '$project'";
 $res = (bool) $client->query( $exists_sql )->fetch_assoc();
 
-// record exists, so increment counter
 if ( $res ) {
+  // record exists, so increment counter
   $update_sql = "UPDATE " . $app . "_projects SET count = count + 1 WHERE project = '$project'";
   $client->query( $update_sql );
 } else {
@@ -64,14 +64,34 @@
   $client->query( $create_sql );
 }
 
+// track massviews sources
+if ( $app === 'massviews' ) {
+  // first check if there is already a record for this project/page/platform/date
+  $source = $_POST['source'];
+  $exists_sql = "SELECT * FROM massviews_sources WHERE source = '$source'";
+  $res = (bool) $client->query( $exists_sql )->fetch_assoc();
+
+  if ( $res ) {
+    // record exists, so increment counter
+    $update_sql = "UPDATE massviews_sources SET count = count + 1 WHERE source = '$source'";
+    $client->query( $update_sql );
+  } else {
+    // create new record
+    $create_sql = "INSERT INTO massviews_sources VALUES(NULL, ?, 0)";
+    $stmt = $client->prepare( $create_sql );
+    $stmt->bind_param( 's', $source );
+    $stmt->execute();
+  }
+}
+
 // do the same for the timeline table
 $date = (new DateTime())->format('Y-m-d');
 
 $exists_sql = "SELECT * FROM " . $app . "_timeline WHERE date = '$date'";
 $res = (bool) $client->query( $exists_sql )->fetch_assoc();
 
-// record exists, so increment counter
 if ( $res ) {
+  // record exists, so increment counter
   $update_sql = "UPDATE " . $app . "_timeline SET count = count + 1 WHERE date = '$date'";
   $client->query( $update_sql );
 } else {

diff --git a/public_html/meta/application.js b/public_html/meta/application.js
diff --git a/public_html/redirectviews/application.js b/public_html/redirectviews/application.js
diff --git a/public_html/siteviews/application.js b/public_html/siteviews/application.js
diff --git a/public_html/topviews/application.js b/public_html/topviews/application.js
diff --git a/public_html/userviews/application.js b/public_html/userviews/application.js
diff --git a/views/_footer.haml b/views/_footer.haml
@@ -31,17 +31,18 @@
     - $MusikAnimal = "<a href='https://en.wikipedia.org/wiki/User:MusikAnimal'>MusikAnimal</a>";
     - $Kaldari = "<a href='https://en.wikipedia.org/wiki/User:Kaldari'>Kaldari</a>";
     - $MarcelRuizForns = "<a href='https://en.wikipedia.org/wiki/User:Mforns_(WMF)'>Marcel Ruiz Forns</a>";
-    = $I18N->msg( 'credits', array( 'variables' => array( $MusikAnimal, $Kaldari, $MarcelRuizForns ), 'parsemag' => true ) );
+    = $I18N->msg( 'credits', [ 'variables' => [ $MusikAnimal, $Kaldari, $MarcelRuizForns ], 'parsemag' => true ] );
 
   %div
     %span.nowrap
       - $heart = "<span class='heart'>&hearts;</span>";
       - $host = "<a href='https://wikitech.wikimedia.org/wiki/Portal:Tool_Labs'>" . $I18N->msg( 'tool-labs' ) . "</a>";
-      = $I18N->msg( 'hosted', array( 'variables' => array( $heart, $host ), 'parsemag' => true ) );
+      = $I18N->msg( 'hosted', [ 'variables' => [ $heart, $host ], 'parsemag' => true ] );
     %span.nowrap
       - $translateWiki = "<a href='https://translatewiki.net/'>translatewiki.net</a>"
+      - $jqueryI18n = "<a href='https://github.com/wikimedia/jquery.i18n'>jQuery.i18n</a>"
       - $intuition = "<a href='https://tools.wmflabs.org/intuition/#tab-about'>Intuition</a>"
-      = $I18N->msg( 'translation-credits', array( 'variables' => array( $translateWiki, $intuition ), 'parsemag' => true ) )
+      = $I18N->msg( 'translation-credits', [ 'variables' => [ $translateWiki, $jqueryI18n, $intuition ], 'parsemag' => true ] )
 
   %div
     - if ( $currentApp !== 'metaviews' )