--- a/crea/integration/metadataplayer/LdtPlayer-core.js Mon Jun 11 16:48:14 2012 +0200
+++ b/crea/integration/metadataplayer/LdtPlayer-core.js Mon Jun 11 17:59:51 2012 +0200
@@ -1534,7 +1534,15 @@
}
}
- this.l10n = (typeof this.messages[IriSP.language] !== "undefined" ? this.messages[IriSP.language] : this.messages["en"]);
+ this.l10n = (
+ typeof this.messages[IriSP.language] !== "undefined"
+ ? this.messages[IriSP.language]
+ : (
+ IriSP.language.length > 2 && typeof this.messages[IriSP.language.substr(0,2)] !== "undefined"
+ ? this.messages[IriSP.language.substr(0,2)]
+ : this.messages["en"]
+ )
+ );
};
--- a/crea/integration/metadataplayer/MusitagAndYou.js Mon Jun 11 16:48:14 2012 +0200
+++ b/crea/integration/metadataplayer/MusitagAndYou.js Mon Jun 11 17:59:51 2012 +0200
@@ -9,9 +9,17 @@
max_right: 900,
width: 870
};
+IriSP.Widgets.MusitagAndYou.prototype.messages = {
+ en: {
+ add_tag: "Add your Musitag!"
+ },
+ fr: {
+ add_tag: "Ajoute ton Musitag !"
+ }
+}
IriSP.Widgets.MusitagAndYou.prototype.template =
- '<div class="Musitag-AndYou-PositionBar"></div><div class="Musitag-AndYou-Main">'
+ '<div class="Musitag-AndYou-PositionBar"></div><div class="Musitag-AndYou-Main" title="{{l10n.add_tag}}">'
+ '<div class="Musitag-AndYou-Tag Musitag-container-50">'
+ '<div class="Musitag-shadow"></div>'
+ '<div class="Musitag-color Musitag-green Musitag-AndYou-crossfade Musitag-AndYou-anim-6s Musitag-AndYou-cf-3"></div>'
--- a/crea/integration/metadataplayer/MusitagAnnotations.js Mon Jun 11 16:48:14 2012 +0200
+++ b/crea/integration/metadataplayer/MusitagAnnotations.js Mon Jun 11 17:59:51 2012 +0200
@@ -13,15 +13,17 @@
+ '<div class="Musitag-shadow"></div>'
+ '<div class="Musitag-color Musitag-{{annotation.color.tag}}"></div>'
+ '<div class="Musitag-emoticon Musitag-{{annotation.emoticon.tag}}"></div>'
- + '</div>{{#annotation.audio}}<div class="Musitag-Annotations-Balloon" audio-url="{{annotation.audio.href}}"></div>{{/annotation.audio}}'
+ + '</div>{{#annotation.audio}}<div class="Musitag-Annotations-Balloon" audio-url="{{annotation.audio.href}}" title="{{l10n.play_voice}}"></div>{{/annotation.audio}}'
+ '</div>';
IriSP.Widgets.MusitagAnnotations.prototype.messages = {
fr: {
- at_timecode: "à"
+ at_timecode: "à",
+ play_voice: "Lire l'annotation vocale"
},
en: {
- at_timecode: "at"
+ at_timecode: "at",
+ play_voice: "Play voice annotation"
}
}
--- a/web/tralalere/static/tralalere/metadataplayer/LdtPlayer-core.js Mon Jun 11 16:48:14 2012 +0200
+++ b/web/tralalere/static/tralalere/metadataplayer/LdtPlayer-core.js Mon Jun 11 17:59:51 2012 +0200
@@ -1534,7 +1534,15 @@
}
}
- this.l10n = (typeof this.messages[IriSP.language] !== "undefined" ? this.messages[IriSP.language] : this.messages["en"]);
+ this.l10n = (
+ typeof this.messages[IriSP.language] !== "undefined"
+ ? this.messages[IriSP.language]
+ : (
+ IriSP.language.length > 2 && typeof this.messages[IriSP.language.substr(0,2)] !== "undefined"
+ ? this.messages[IriSP.language.substr(0,2)]
+ : this.messages["en"]
+ )
+ );
};
--- a/web/tralalere/static/tralalere/metadataplayer/MusitagAndYou.js Mon Jun 11 16:48:14 2012 +0200
+++ b/web/tralalere/static/tralalere/metadataplayer/MusitagAndYou.js Mon Jun 11 17:59:51 2012 +0200
@@ -9,9 +9,17 @@
max_right: 900,
width: 870
};
+IriSP.Widgets.MusitagAndYou.prototype.messages = {
+ en: {
+ add_tag: "Add your Musitag!"
+ },
+ fr: {
+ add_tag: "Ajoute ton Musitag !"
+ }
+}
IriSP.Widgets.MusitagAndYou.prototype.template =
- '<div class="Musitag-AndYou-PositionBar"></div><div class="Musitag-AndYou-Main">'
+ '<div class="Musitag-AndYou-PositionBar"></div><div class="Musitag-AndYou-Main" title="{{l10n.add_tag}}">'
+ '<div class="Musitag-AndYou-Tag Musitag-container-50">'
+ '<div class="Musitag-shadow"></div>'
+ '<div class="Musitag-color Musitag-green Musitag-AndYou-crossfade Musitag-AndYou-anim-6s Musitag-AndYou-cf-3"></div>'
--- a/web/tralalere/static/tralalere/metadataplayer/MusitagAnnotations.js Mon Jun 11 16:48:14 2012 +0200
+++ b/web/tralalere/static/tralalere/metadataplayer/MusitagAnnotations.js Mon Jun 11 17:59:51 2012 +0200
@@ -13,15 +13,17 @@
+ '<div class="Musitag-shadow"></div>'
+ '<div class="Musitag-color Musitag-{{annotation.color.tag}}"></div>'
+ '<div class="Musitag-emoticon Musitag-{{annotation.emoticon.tag}}"></div>'
- + '</div>{{#annotation.audio}}<div class="Musitag-Annotations-Balloon" audio-url="{{annotation.audio.href}}"></div>{{/annotation.audio}}'
+ + '</div>{{#annotation.audio}}<div class="Musitag-Annotations-Balloon" audio-url="{{annotation.audio.href}}" title="{{l10n.play_voice}}"></div>{{/annotation.audio}}'
+ '</div>';
IriSP.Widgets.MusitagAnnotations.prototype.messages = {
fr: {
- at_timecode: "à"
+ at_timecode: "à",
+ play_voice: "Lire l'annotation vocale"
},
en: {
- at_timecode: "at"
+ at_timecode: "at",
+ play_voice: "Play voice annotation"
}
}