Merge lp:~lderan/ubiquity-slideshow-ubuntu/test into lp:ubiquity-slideshow-ubuntu

[Thomas Molloy]

Slideshow.py - now fetches the version number and name and sends them to the slideshow
Slideshow.js - replaces objects with .versionId & .releaseName with Id and name respectively

Usage example:

You are installing Ubuntu<span class="version-details"> <span class="version-id"></span>, <span class="releaseName"></span>.
results in:
You are installing Ubuntu 13.04, Raring Ringtail.

In the case the slideshow can't acquire the the version name or number, the contents of version-details will be ignored:
You are installing Ubuntu.

Slideshow.py - now fetches the version number and name and sends them to the slideshow
Slideshow.js - replaces objects with .versionId & .releaseName with Id and name respectively

Usage example
<span class="versionId"></span> <span class="releaseName"></span>
results in
13.04 Raring Ringtail

[Pasi Lallinaho (knome)]

review: Approve (community)

[lp:~lderan/ubiquity-slideshow-ubuntu/test]

570. By Thomas Molloy on 2013-08-18

Change xubuntu welcome home back

[Dylan McCall (dylanmccall)]

So, my feeling on this is each slideshow content version should be targeted towards a particular Ubuntu release. If it's necessary to grab the version ID automatically, my assumption is that means we're either shipping outdated content (because, really, a lot changes from one release to the next and we've already had a few instances where flavours ship with plainly incorrect slideshow content); or we're shipping very general content (which could be argued for…). Am I missing something? :)

Personally, I've always been an advocate of just not repeating the version number here at all since Ubiquity already communicates that and it isn't really relevant information at this stage, but I don't think I've won that argument.

Anyway, this is optional, so I don't mind, but for this change to work, we'll also need a change in a released or to-be-released version of Ubiquity that is similar to what you have in Slideshow.py. Has that happened at this stage? It might also be nice to have a sensible fallback in the event that the version ID isn't provided, too. Right now it looks like we'll get an empty space after a comma, and no version number. Perhaps wrap that whole thing in an element that disappears if there's no version number available, like "Xubuntu<span class="versionDetails">, <span class="releaseName"></span> <span class="versionId"></span></span>"?

Also - and I promise this is a tiny thing - your element classes are inconsistent. Please use dashes instead of camel case, there, like "release-name" and "version-id".

Thank you!

review: Needs Fixing

[Pasi Lallinaho (knome)]

With the Xubuntu slideshows, we try to make the slideshow content as version-agnostic as possible: this change makes sense for us and leaves less room for human errors.

I agree that there should be a fallback, but I have no idea what that could be.

[Pasi Lallinaho (knome)]

Having read it again (and understood it) I agree with the proposed fallback.

[Dylan McCall (dylanmccall)]

Come to think of it, I just realized my proposed fallback could be trouble
for localisation, but to be honest I'm giving this a very cursory look :)
Happy with this being merged, anyway!
On 18 Aug 2013 14:41, "Pasi Lallinaho" <email address hidden> wrote:

> Having read it again (and understood it) I agree with the proposed
> fallback.
> --
>
> https://code.launchpad.net/~lderan/ubiquity-slideshow-ubuntu/test/+merge/180747
> You are reviewing the proposed merge of
> lp:~lderan/ubiquity-slideshow-ubuntu/test into lp:ubiquity-slideshow-ubuntu.
>

[Pasi Lallinaho (knome)]

Wouldn't the strings to be translated include the HTML tags as they are? In that case it would only mean the translators would need to know the usage, which I think is a relatively small problem.

[lp:~lderan/ubiquity-slideshow-ubuntu/test]

571. By Thomas Molloy on 2013-08-19

added a fallback and added an example to the xubuntu welcome

572. By Thomas Molloy on 2013-08-19

tidying up

[Thomas Molloy (lderan)]

I have put in the suggested fallback, is the current functionality of it okay?
As for translations, the bit that replaces the text happens after the slide is translated so it should be as Knome says.

Unmerged revisions

572. By Thomas Molloy on 2013-08-19

tidying up

571. By Thomas Molloy on 2013-08-19

added a fallback and added an example to the xubuntu welcome

570. By Thomas Molloy on 2013-08-18

Change xubuntu welcome home back

569. By Thomas Molloy on 2013-08-18

version number and name passed to the slideshow

=== modified file 'Slideshow.py'
--- Slideshow.py	2012-09-05 20:16:23 +0000
+++ Slideshow.py	2013-08-19 23:59:45 +0000
@@ -4,6 +4,8 @@
 from gi.repository import GLib, Gdk, Gtk, WebKit
 from configparser import ConfigParser
 import subprocess
+import platform
+import csv
 
 import sys
 import locale
@@ -36,6 +38,20 @@
 		if controls:
 			parameters.append('controls')
 		
+		''' Fetches the version number from /etc/lsb-release '''
+		version = platform.linux_distribution()[1]
+		''' now to get the full name as .linux_distribution only returns the shortname '''
+		release = ""
+		distroInfoFile = open("/usr/share/distro-info/ubuntu.csv")
+		csv_reader = csv.DictReader(distroInfoFile)
+		for row in csv_reader:
+			if row['version'] == version:
+				release = row['codename']
+				break
+
+		parameters.append('ver='+version)
+		parameters.append('release='+release)
+		
 		WebKit.WebView.__init__(self)
 		parameters_encoded = '&'.join(parameters)
 		self.open('%s#%s' % (slideshow_main, parameters_encoded))

=== modified file 'slideshows/link-core/slideshow.js'
--- slideshows/link-core/slideshow.js	2013-02-13 16:02:10 +0000
+++ slideshows/link-core/slideshow.js	2013-08-19 23:59:45 +0000
@@ -37,7 +37,30 @@
 var directory = {};
 var extra_directory = {};
 
+var version_number;
+var release_name;
+
+$.extend({
+  getUrlVars: function(){
+    var vars = [], hash;
+    var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+    for(var i = 0; i < hashes.length; i++)
+    {
+      hash = hashes[i].split('=');
+      vars.push(hash[0]);
+      vars[hash[0]] = hash[1];
+    }
+    return vars;
+  },
+  getUrlVar: function(name){
+    return decodeURIComponent($.getUrlVars()[name]);
+  }
+});
+
 $(document).ready(function() {
+	versionNumber = $.getUrlVar('ver');
+	releaseName = $.getUrlVar('release');
+
 	function loadExtraSlides() {
 		$.ajax({
 			type: 'GET',
@@ -212,6 +235,18 @@
 				success: function(data, status, xhr) {
 					$(data).appendTo(slide);
 					translateSlideContents(locale, slide);
+					if(version_number == "undefined" || release_name == "undefined"){
+						$(slide).find(".version-details").each(function(){
+							$(this).remove();
+						});
+					} else {
+						$(slide).find(".version-id").each(function(){
+							$(this).html(version_number);
+						});
+						$(slide).find(".release-name").each(function(){
+							$(this).html(release_name);
+						});
+					}
 				}
 			});
 		} else {

=== modified file 'slideshows/xubuntu/slides/00_welcome.html'
--- slideshows/xubuntu/slides/00_welcome.html	2013-06-25 15:52:49 +0000
+++ slideshows/xubuntu/slides/00_welcome.html	2013-08-19 23:59:45 +0000
@@ -4,7 +4,7 @@
 
 <div class="main">
 	<div class="content">
-		<p>You have chosen to install the latest version of Xubuntu, 13.10.</p>
+		<p>You have chosen to install the latest version of Xubuntu<span class="version-details">, <span class="version-id"></span></span>.</p>
 		<p>This exciting piece of software is brought to you free of any fees, for your use and any others you want to share it with.</p>
 		<p>Since you are installing this software using the Xubuntu live installation, feel free to examine things as it installs. After the installation, the desktop will look much the same as it does now.</p>
 	</div>