From bcce178a4faa92fd36db9bbd5f7cb214a9982300 Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Wed, 12 Feb 2014 09:19:49 +0000
Subject: [PATCH 01/58] upgraded ember I18n & CLDR libraries

---
 app/javascripts/app.js                        |   4 +-
 app/javascripts/locales/en.js                 |   3 -
 .../templates/location_view.handlebars        |   2 +-
 .../templates/report_view.handlebars          |   8 +-
 .../templates/saved_search.handlebars         |   2 +-
 .../taxon_concept_history_view.handlebars     |   2 +-
 .../vendor/{plurals.js => cldr-1.0.0.js}      |  68 +++---
 app/javascripts/vendor/ember-i18n.js          | 167 --------------
 app/javascripts/vendor/i18n.js                | 215 ++++++++++++++++++
 9 files changed, 254 insertions(+), 217 deletions(-)
 rename app/javascripts/vendor/{plurals.js => cldr-1.0.0.js} (82%)
 delete mode 100644 app/javascripts/vendor/ember-i18n.js
 create mode 100644 app/javascripts/vendor/i18n.js

diff --git a/app/javascripts/app.js b/app/javascripts/app.js
index c9e83f7..0f711f8 100644
--- a/app/javascripts/app.js
+++ b/app/javascripts/app.js
@@ -6,8 +6,8 @@ require('checklist/vendor/spin.min');
 require('checklist/vendor/ember');
 require('checklist/vendor/ember-data');
 
-require('checklist/vendor/plurals');
-require('checklist/vendor/ember-i18n');
+require('checklist/vendor/cldr-1.0.0');
+require('checklist/vendor/i18n');
 
 minispade.requireAll(/locales/);
 minispade.requireAll(/templates/);
diff --git a/app/javascripts/locales/en.js b/app/javascripts/locales/en.js
index 89de974..34832a1 100644
--- a/app/javascripts/locales/en.js
+++ b/app/javascripts/locales/en.js
@@ -29,7 +29,4 @@ Em.I18n.locales.en = {
   'reports.generating.title': 'Currently Generating Reportings',
   'reports.latest.title': 'Your report is being generated',
 
-  'results.count.zero': 'taxa',
-  'results.count.one': 'taxon',
-  'results.count.other': 'taxa'
 };
diff --git a/app/javascripts/templates/location_view.handlebars b/app/javascripts/templates/location_view.handlebars
index 703a13c..ab264fd 100644
--- a/app/javascripts/templates/location_view.handlebars
+++ b/app/javascripts/templates/location_view.handlebars
@@ -1,5 +1,5 @@
 <div class="btn-holder">
-  <a class="btn">{{tt locations.count countBinding="view.count"
+  <a class="btn">{{t locations.count countBinding="view.count"
     tagName=""}}</a>
   <div class="drop">
     <div class="drop-search">
diff --git a/app/javascripts/templates/report_view.handlebars b/app/javascripts/templates/report_view.handlebars
index 1882108..a272813 100644
--- a/app/javascripts/templates/report_view.handlebars
+++ b/app/javascripts/templates/report_view.handlebars
@@ -2,21 +2,21 @@
   <li>
     {{#if controllers.downloadController.generating.length}}
       <a {{action "generatingClick" target="view" on="click"}} id="generating-downloads-btn" href="#generating-downloads">
-        {{tt reports.count countBinding="controllers.downloadController.generating.length"}}
+        {{t reports.count countBinding="controllers.downloadController.generating.length"}}
       </a>
     {{/if}}
   </li>
   <li>
     {{#if controllers.downloadController.complete.length}}
       <a class="red" id="complete-download-btn" href="#complete-downloads">
-        {{tt reports.ready.count countBinding="controllers.downloadController.complete.length"}}
+        {{t reports.ready.count countBinding="controllers.downloadController.complete.length"}}
       </a>
     {{/if}}
   </li>
   <li>
     {{#if controllers.downloadController.failed.length}}
       <a class="red" id="failed-download-btn" href="#failed-downloads">
-        {{tt reports.failed.count countBinding="controllers.downloadController.failed.length"}}
+        {{t reports.failed.count countBinding="controllers.downloadController.failed.length"}}
       </a>
     {{/if}}
   </li>
@@ -73,7 +73,7 @@
 <div style="display:none">
   <div id="failed-downloads" class="lightbox downloads status">
     <div class="heading-holder">
-      <strong class="heading">{{tt reports.failed.count countBinding="controllers.downloadController.failed.length"}}</strong>
+      <strong class="heading">{{t reports.failed.count countBinding="controllers.downloadController.failed.length"}}</strong>
     </div>
     <div class="text-holder">
       {{t reports.failed.description}}
diff --git a/app/javascripts/templates/saved_search.handlebars b/app/javascripts/templates/saved_search.handlebars
index 36edf53..1a614b4 100644
--- a/app/javascripts/templates/saved_search.handlebars
+++ b/app/javascripts/templates/saved_search.handlebars
@@ -6,7 +6,7 @@
 
 <div class="saved-holder">
   <a class="btn-saved">
-    {{tt saved_search.count
+    {{t saved_search.count
       countBinding="controllers.savedSearchController.content.length"}}
     <div class="drop">
       <div class="drop-holder">
diff --git a/app/javascripts/templates/taxon_concept_history_view.handlebars b/app/javascripts/templates/taxon_concept_history_view.handlebars
index d8ed076..2c48582 100644
--- a/app/javascripts/templates/taxon_concept_history_view.handlebars
+++ b/app/javascripts/templates/taxon_concept_history_view.handlebars
@@ -10,7 +10,7 @@
 
   {{#if view.countryCount}}
     <a {{action "expandCountryTimeline" target="view"}} class="expandCountryTimeline">
-      {{tt timeline.party}}
+      {{t timeline.party}}
     </a>
 
     <div class="country-timelines">
diff --git a/app/javascripts/vendor/plurals.js b/app/javascripts/vendor/cldr-1.0.0.js
similarity index 82%
rename from app/javascripts/vendor/plurals.js
rename to app/javascripts/vendor/cldr-1.0.0.js
index f94ea6e..6b6e9ca 100644
--- a/app/javascripts/vendor/plurals.js
+++ b/app/javascripts/vendor/cldr-1.0.0.js
@@ -23,13 +23,13 @@
     return false;
   }
 
-  function define(languages, rule) {
+  function defineLanguageRule(languages, rule) {
     for ( var i = 0; i < languages.length; ++i ) {
       Data[ languages[i] ] = rule;
     }
   }
 
-  define([
+  defineLanguageRule([
     'az', 'bm', 'my', 'zh', 'dz', 'ka', 'hu', 'ig', 'id', 'ja', 'jv', 'kea',
     'kn', 'km', 'ko', 'ses', 'lo', 'kde', 'ms', 'fa', 'root', 'sah', 'sg',
     'ii', 'th', 'bo', 'to', 'tr', 'vi', 'wo', 'yo'
@@ -37,42 +37,34 @@
     return Other;
   });
 
-  define([ 'gv' ], function(n) {
+  defineLanguageRule([ 'gv' ], function(n) {
     if ( isAmong(n % 10, [ 1, 2 ]) || n % 20 === 0 ) { return One; }
     return Other;
   });
 
-  define([ 'tzm' ], function(n) {
+  defineLanguageRule([ 'tzm' ], function(n) {
     if ( n === 0 || n === 1 ) { return One; }
     if ( isInt(n) && n >= 11 && n <= 99 ) { return One; }
     return Other;
   });
 
-  define([ 'mk' ], function(n) {
+  defineLanguageRule([ 'mk' ], function(n) {
     return n % 10 === 1 && n !== 11 ? One : Other;
   });
 
-  define([ 'fr', 'ff', 'kab' ], function(n) {
+  defineLanguageRule([ 'fr', 'ff', 'kab' ], function(n) {
     return n >= 0 && n < 2 ? One : Other;
   });
 
-  define([
+  defineLanguageRule([
     'ak', 'am', 'bh', 'fil', 'guw', 'hi', 'ln', 'mg', 'nso', 'tl', 'ti', 'wa'
   ], function(n) {
     return n === 0 || n === 1 ? One : Other;
   });
 
-  define([ 'en' ], function(n) {
-    switch ( n ) {
-      case 0: return Zero;
-      case 1: return One;
-      default: return Other;
-    }
-  });
-
-  define([
+  defineLanguageRule([
     'af', 'sq', 'eu', 'bem', 'bn', 'brx', 'bg', 'ca', 'chr', 'cgg', 'da', 'dv',
-    'nl', 'eo', 'et', 'ee', 'fo', 'fi', 'fur', 'gl', 'lg', 'de', 'el',
+    'nl', 'en', 'eo', 'et', 'ee', 'fo', 'fi', 'fur', 'gl', 'lg', 'de', 'el',
     'gu', 'ha', 'haw', 'he', 'is', 'it', 'kl', 'kk', 'ku', 'lb', 'ml', 'mr',
     'mas', 'mn', 'nah', 'ne', 'no', 'nb', 'nn', 'nyn', 'or', 'om', 'pap', 'ps',
     'pt', 'pa', 'rm', 'ssy', 'saq', 'xog', 'so', 'es', 'sw', 'sv', 'gsw',
@@ -81,25 +73,25 @@
     return n === 1 ? One : Other;
   });
 
-  define([ 'lv' ], function(n) {
+  defineLanguageRule([ 'lv' ], function(n) {
     if (n === 0) { return Zero; }
     if (n % 10 === 1 && n % 100 !== 11) { return One; }
     return Other;
   });
 
-  define([ 'ksh' ], function(n) {
+  defineLanguageRule([ 'ksh' ], function(n) {
     if (n === 0) { return Zero; }
     if (n === 1) { return One; }
     return Other;
   });
 
-  define([ 'lag' ], function(n) {
+  defineLanguageRule([ 'lag' ], function(n) {
     if (n === 0) { return Zero; }
     if (n > 0 && n < 2) { return One; }
     return Other;
   });
 
-  define([
+  defineLanguageRule([
     'kw', 'smn', 'iu', 'ga', 'smj', 'se', 'smi', 'sms', 'sma'
   ], function(n) {
     if (n === 1) { return One; }
@@ -107,7 +99,7 @@
     return Other;
   });
 
-  define([
+  defineLanguageRule([
     'be', 'bs', 'hr', 'ru', 'sr', 'sh', 'uk'
   ], function(n) {
     var mod10  = n % 10,
@@ -124,7 +116,7 @@
     return Other;
   });
 
-  define([ 'pl' ], function(n) {
+  defineLanguageRule([ 'pl' ], function(n) {
     var mod10  = n % 10,
         mod100 = n % 100;
 
@@ -139,7 +131,7 @@
     return Other;
   });
 
-  define([ 'lt' ], function(n) {
+  defineLanguageRule([ 'lt' ], function(n) {
     var mod10  = n % 10,
         mod100 = n % 100;
 
@@ -152,13 +144,13 @@
     return Other;
   });
 
-  define([ 'shi' ], function(n) {
+  defineLanguageRule([ 'shi' ], function(n) {
     if ( n >= 0 && n <= 1 ) { return One; }
     if ( isInt(n) && n >= 2 && n <= 9 ) { return Few; }
     return Other;
   });
 
-  define([ 'mo', 'ro' ], function(n) {
+  defineLanguageRule([ 'mo', 'ro' ], function(n) {
     var mod100 = n % 100;
 
     if ( n === 1 ) { return One; }
@@ -169,13 +161,13 @@
     return Other;
   });
 
-  define([ 'cs', 'sk' ], function(n) {
+  defineLanguageRule([ 'cs', 'sk' ], function(n) {
     if ( n === 1 ) { return One; }
     if ( isAmong(n, [ 2, 3, 4 ]) ) { return Few; }
     return Other;
   });
 
-  define([ 'sl' ], function(n) {
+  defineLanguageRule([ 'sl' ], function(n) {
     var mod100 = n % 100;
     if ( mod100 === 1 ) { return One; }
     if ( mod100 === 2 ) { return Two; }
@@ -183,7 +175,7 @@
     return Other;
   });
 
-  define([ 'mt' ], function(n) {
+  defineLanguageRule([ 'mt' ], function(n) {
     if ( n === 1 ) { return One; }
     var mod100 = n % 100;
     if ( isInt(mod100) && mod100 >= 2 && mod100 <= 10 ) { return Few; }
@@ -191,7 +183,7 @@
     return Other;
   });
 
-  define([ 'ar' ], function(n) {
+  defineLanguageRule([ 'ar' ], function(n) {
     if ( n === 0 ) { return Zero; }
     if ( n === 1 ) { return One; }
     if ( n === 2 ) { return Two; }
@@ -201,7 +193,7 @@
     return Other;
   });
 
-  define([ 'br', 'cy' ], function(n) {
+  defineLanguageRule([ 'br', 'cy' ], function(n) {
     switch ( n ) {
       case 0: return Zero;
       case 1: return One;
@@ -233,16 +225,16 @@
     if (count == null) { throw new Error("CLDR.pluralForm requires a count"); }
     language = language || CLDR.defaultLanguage;
     if (language == null) { throw new Error("CLDR.pluralForm requires a language"); }
-    language = language.replace(/^(\w\w).*/, "$1");
+    language = language.replace(/^(\w\w\w?)-?.*/, "$1");
     if (Data[language] == null) { throw new Error("No CLDR pluralization information for " + language); }
     return Data[language].call(CLDR, +count);
   };
 
-  CLDR.pluralForm.Zero  = 'zero';
-  CLDR.pluralForm.One   = 'one';
-  CLDR.pluralForm.Two   = 'two';
-  CLDR.pluralForm.Few   = 'few';
-  CLDR.pluralForm.Many  = 'many';
-  CLDR.pluralForm.Other = 'other';
+  CLDR.pluralForm.Zero  = Zero;
+  CLDR.pluralForm.One   = One;
+  CLDR.pluralForm.Two   = Two;
+  CLDR.pluralForm.Few   = Few;
+  CLDR.pluralForm.Many  = Many;
+  CLDR.pluralForm.Other = Other;
 
 }(this));
diff --git a/app/javascripts/vendor/ember-i18n.js b/app/javascripts/vendor/ember-i18n.js
deleted file mode 100644
index 2df39c3..0000000
--- a/app/javascripts/vendor/ember-i18n.js
+++ /dev/null
@@ -1,167 +0,0 @@
-// Generated by CoffeeScript 1.3.3
-(function() {
-  var I18n, findTemplate, get, isBinding, isTranslatedAttribute, pluralForm;
-
-  isTranslatedAttribute = /(.+)Translation$/;
-
-  get = Ember.Handlebars.get || Ember.get;
-
-  if (typeof CLDR !== "undefined" && CLDR !== null) {
-    pluralForm = CLDR.pluralForm;
-  }
-
-  if (pluralForm == null) {
-    Ember.Logger.warn("CLDR.pluralForm not found. Em.I18n will not support count-based inflection.");
-  }
-
-  findTemplate = function(key, setOnMissing) {
-    var locale, parts, result, translations;
-    Ember.assert("You must provide a translation key string, not %@".fmt(key), typeof key === "string");
-    locale = I18n.get("currentLocale");
-    parts = key.split(".");
-    if (parts && I18n.get("locales")[parts[0]]) {
-      locale = parts[0];
-      key = parts.slice(1).join(".");
-    }
-    translations = I18n.get("locales")[locale];
-    Ember.assert("Dictionary Ember.I18n.locale." + locale + " for locale " + locale + " is not set", translations);
-    result = translations[key];
-    if (!(setOnMissing ? result != null : void 0)) {
-      result = translations[key] = I18n.compile("Missing translation: " + key);
-    }
-    if ((result != null) && !$.isFunction(result)) {
-      result = translations[key] = I18n.compile(result);
-    }
-    return result;
-  };
-
-  I18n = Ember.Object.create({
-    currentLocale: 'en',
-    locales: {},
-    compile: Handlebars.compile,
-    translations: {},
-    template: function(key, count) {
-      var interpolatedKey, result, suffix;
-      if ((count != null) && (pluralForm != null)) {
-        suffix = pluralForm(count);
-        interpolatedKey = "%@.%@".fmt(key, suffix);
-        result = findTemplate(interpolatedKey, true);
-      }
-      return result != null ? result : result = findTemplate(key, true);
-    },
-    t: function(key, context) {
-      var template;
-      if (context == null) {
-        context = {};
-      }
-      template = I18n.template(key, context.count);
-      return template(context);
-    },
-    TranslateableAttributes: Em.Mixin.create({
-      didInsertElement: function() {
-        var attribute, isTranslatedAttributeMatch, key, path, result;
-        result = this._super.apply(this, arguments_);
-        this._translateableAttributes = [];
-        for (key in this) {
-          path = this[key];
-          isTranslatedAttributeMatch = key.match(isTranslatedAttribute);
-          if (isTranslatedAttributeMatch) {
-            attribute = isTranslatedAttributeMatch[1];
-            this._translateableAttributes.pushObject({
-              attribute: attribute,
-              path: path
-            });
-          }
-        }
-        this.translateAttributes();
-        return result;
-      },
-      translateAttributes: function() {
-        var $this, translateableAttributes;
-        $this = this.$();
-        translateableAttributes = this._translateableAttributes;
-        return translateableAttributes.forEach(function(hash) {
-          if (hash.attribute && hash.path) {
-            return $this.attr(hash.attribute, I18n.t(hash.path));
-          }
-        });
-      }.observes("Ember.I18n.currentLocale")
-    })
-  });
-
-  Em.I18n = I18n;
-
-  Ember.I18n = I18n;
-
-  isBinding = /(.+)Binding$/;
-
-  Handlebars.registerHelper('t', function(key, options) {
-    var attrs, context, elementID, result, tagName, view;
-    context = this;
-    attrs = options.hash;
-    view = options.data.view;
-    tagName = attrs.tagName || 'span';
-    delete attrs.tagName;
-    elementID = "i18n-" + (jQuery.uuid++);
-    Em.keys(attrs).forEach(function(property) {
-      var bindPath, currentValue, invoker, isBindingMatch, observer, propertyName;
-      isBindingMatch = property.match(isBinding);
-      if (isBindingMatch) {
-        propertyName = isBindingMatch[1];
-        bindPath = attrs[property];
-        currentValue = get(context, bindPath);
-        attrs[propertyName] = currentValue;
-        invoker = null;
-        observer = function() {
-          var elem, newValue;
-          newValue = get(context, bindPath);
-          elem = view.$("#" + elementID);
-          if (elem.length === 0) {
-            Em.removeObserver(context, bindPath, invoker);
-            return;
-          }
-          attrs[propertyName] = newValue;
-          return elem.html(I18n.t(key, attrs));
-        };
-        invoker = function() {
-          return Em.run.once(observer);
-        };
-        return Em.addObserver(context, bindPath, invoker);
-      }
-    });
-    result = '<%@ id="%@">%@</%@>'.fmt(tagName, elementID, I18n.t(key, attrs), tagName);
-    return new Handlebars.SafeString(result);
-  });
-
-  Handlebars.registerHelper('translateAttr', function(options) {
-    var attrs, result;
-    attrs = options.hash;
-    result = [];
-    Em.keys(attrs).forEach(function(property) {
-      var translatedValue;
-      translatedValue = I18n.t(attrs[property]);
-      return result.push('%@="%@"'.fmt(property, translatedValue));
-    });
-    return new Handlebars.SafeString(result.join(' '));
-  });
-
-  Handlebars.registerHelper("tt", function(key, options) {
-    var view;
-    options.hash.keyBinding = key;
-    options.hash.languageBinding = "Ember.I18n.currentLocale";
-    view = Ember.View.extend({
-      tagName: "span",
-      template: Ember.Handlebars.compile("{{view.formattedContent}}"),
-      formattedContent: (function() {
-        var language;
-        key = this.get("key") || key;
-        language = this.get("language");
-        if (key) {
-          return Ember.Handlebars.helpers.t.call(this, language + "." + key, options);
-        }
-      }).property("key", "language")
-    });
-    return Ember.Handlebars.helpers.view.call(this, view, options);
-  });
-
-}).call(this);
diff --git a/app/javascripts/vendor/i18n.js b/app/javascripts/vendor/i18n.js
new file mode 100644
index 0000000..105f906
--- /dev/null
+++ b/app/javascripts/vendor/i18n.js
@@ -0,0 +1,215 @@
+(function(window) {
+  var I18n, assert, findTemplate, get, set, isBinding, lookupKey, pluralForm,
+      keyExists, runAfterRender;
+
+  get = Ember.Handlebars.get || Ember.Handlebars.getPath || Ember.getPath;
+  set = Ember.set;
+
+  function warn(msg) { Ember.Logger.warn(msg); }
+
+  if (typeof CLDR !== "undefined" && CLDR !== null) pluralForm = CLDR.pluralForm;
+
+  if (pluralForm == null) {
+    warn("CLDR.pluralForm not found. Em.I18n will not support count-based inflection.");
+  }
+
+  lookupKey = function(key, hash) {
+    var firstKey, idx, remainingKeys;
+
+    if (hash[key] != null) { return hash[key]; }
+
+    if ((idx = key.indexOf('.')) !== -1) {
+      firstKey = key.substr(0, idx);
+      remainingKeys = key.substr(idx + 1);
+      hash = hash[firstKey];
+      if (hash) { return lookupKey(remainingKeys, hash); }
+    }
+  };
+
+  assert = Ember.assert != null ? Ember.assert : window.ember_assert;
+
+  findTemplate = function(key, setOnMissing) {
+    assert("You must provide a translation key string, not %@".fmt(key), typeof key === 'string');
+    var result = lookupKey(key, I18n.translations);
+
+    if (setOnMissing) {
+      if (result == null) {
+        result = I18n.translations[key] = function() { return "Missing translation: " + key; };
+        result._isMissing = true;
+        warn("Missing translation: " + key);
+        I18n[(typeof I18n.trigger === 'function' ? 'trigger' : 'fire')]('missing', key); //Support 0.9 style .fire
+      }
+    }
+
+    if ((result != null) && !jQuery.isFunction(result)) {
+      result = I18n.translations[key] = I18n.compile(result);
+    }
+
+    return result;
+  };
+
+  keyExists = function(key) {
+    var translation = lookupKey(key, I18n.translations);
+    return translation != null && !translation._isMissing;
+  };
+
+  runAfterRender = (function() {
+    if (Em.run.queues.indexOf('afterRender') === -1) {
+      // Ember 0.9 doesn't have an afterRender queue.
+      return function runAfterRender(callback) {
+        return Em.run.once(callback);
+      };
+    }
+
+    return function runAfterRender(callback) {
+      return Em.run.scheduleOnce('afterRender', callback);
+    };
+  }());
+
+  function eachTranslatedAttribute(object, fn) {
+    var isTranslatedAttribute = /(.+)Translation$/,
+        isTranslatedAttributeMatch;
+
+    for (var key in object) {
+      isTranslatedAttributeMatch = key.match(isTranslatedAttribute);
+      if (isTranslatedAttributeMatch) {
+        fn.call(object, isTranslatedAttributeMatch[1], I18n.t(object[key]));
+      }
+    }
+  }
+
+  I18n = Ember.Evented.apply({
+    compile: Handlebars.compile,
+
+    translations: {},
+
+    // Ember.I18n.eachTranslatedAttribute(object, callback)
+    //
+    // Iterate over the keys in `object`; for each property that ends in "Translation",
+    // call `callback` with the property name (minus the "Translation" suffix) and the
+    // translation whose key is the property's value.
+    eachTranslatedAttribute: eachTranslatedAttribute,
+
+    template: function(key, count) {
+      var interpolatedKey, result, suffix;
+      if ((count != null) && (pluralForm != null)) {
+        suffix = pluralForm(count);
+        interpolatedKey = "%@.%@".fmt(key, suffix);
+        result = findTemplate(interpolatedKey, false);
+      }
+      return result != null ? result : result = findTemplate(key, true);
+    },
+
+    t: function(key, context) {
+      var template;
+      if (context == null) context = {};
+      template = I18n.template(key, context.count);
+      return template(context);
+    },
+
+    exists: keyExists,
+
+    TranslateableProperties: Em.Mixin.create({
+      init: function() {
+        var result = this._super.apply(this, arguments);
+        eachTranslatedAttribute(this, function(attribute, translation) {
+          this.addObserver(attribute + 'Translation', this, function(){
+            set(this, attribute, I18n.t(this.get(attribute + 'Translation')));
+          });
+          set(this, attribute, translation);
+        });
+
+        return result;
+      }
+    }),
+
+    TranslateableAttributes: Em.Mixin.create({
+      didInsertElement: function() {
+        var result = this._super.apply(this, arguments);
+        eachTranslatedAttribute(this, function(attribute, translation) {
+          this.$().attr(attribute, translation);
+        });
+        return result;
+      }
+    })
+  });
+
+  Ember.I18n = I18n;
+
+  isBinding = /(.+)Binding$/;
+
+  // CRUFT: in v2, which requires Ember 1.0+, Ember.uuid will always be
+  //        available, so this function can be cleaned up.
+  var uniqueElementId = (function(){
+    var id = Ember.uuid || 0;
+    return function() {
+      var elementId = 'i18n-' + id++;
+      return elementId;
+    };
+  })();
+
+  Handlebars.registerHelper('t', function(key, options) {
+    var attrs, context, data, elementID, result, tagName, view;
+    context = this;
+    attrs = options.hash;
+    data = options.data;
+    view = data.view;
+    tagName = attrs.tagName || 'span';
+    delete attrs.tagName;
+    elementID = uniqueElementId();
+
+    Em.keys(attrs).forEach(function(property) {
+      var bindPath, currentValue, invoker, isBindingMatch, normalized, normalizedPath, observer, propertyName, root, _ref;
+      isBindingMatch = property.match(isBinding);
+
+      if (isBindingMatch) {
+        propertyName = isBindingMatch[1];
+        bindPath = attrs[property];
+        currentValue = get(context, bindPath, options);
+        attrs[propertyName] = currentValue;
+        invoker = null;
+        normalized = Ember.Handlebars.normalizePath(context, bindPath, data);
+        _ref = [normalized.root, normalized.path], root = _ref[0], normalizedPath = _ref[1];
+
+        observer = function() {
+          var elem, newValue;
+          if (view.get('state') !== 'inDOM') {
+            Em.removeObserver(root, normalizedPath, invoker);
+            return;
+          }
+          newValue = get(context, bindPath, options);
+          elem = view.$("#" + elementID);
+          attrs[propertyName] = newValue;
+          return elem.html(I18n.t(key, attrs));
+        };
+
+        invoker = function() {
+          return runAfterRender(observer);
+        };
+
+        return Em.addObserver(root, normalizedPath, invoker);
+      }
+    });
+
+    result = '<%@ id="%@">%@</%@>'.fmt(tagName, elementID, I18n.t(key, attrs), tagName);
+    return new Handlebars.SafeString(result);
+  });
+
+  var attrHelperFunction = function(options) {
+    var attrs, result;
+    attrs = options.hash;
+    result = [];
+
+    Em.keys(attrs).forEach(function(property) {
+      var translatedValue;
+      translatedValue = I18n.t(attrs[property]);
+      return result.push('%@="%@"'.fmt(property, translatedValue));
+    });
+
+    return new Handlebars.SafeString(result.join(' '));
+  };
+
+  Handlebars.registerHelper('translateAttr', attrHelperFunction);
+  Handlebars.registerHelper('ta', attrHelperFunction);
+
+}).call(undefined, this);

From b88af6c288259c570594c94ccd1cd7f817c61282 Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Wed, 12 Feb 2014 16:10:49 +0000
Subject: [PATCH 02/58] [#65553142] extracted strings from templates and views

---
 app/javascripts/locales/en.js                 | 66 +++++++++++++++++++
 .../templates/about_header_view.handlebars    |  8 +--
 .../templates/application_view.handlebars     |  2 +-
 .../templates/checklist_form.handlebars       |  4 +-
 .../templates/countries_list.handlebars       |  4 +-
 .../templates/custom_search.handlebars        | 20 +++---
 .../templates/download_collection.handlebars  |  8 +--
 .../templates/download_view.handlebars        |  6 +-
 .../templates/kingdom_list_view.handlebars    |  6 +-
 .../templates/location_view.handlebars        |  8 +--
 .../templates/main_header_view.handlebars     |  4 +-
 .../templates/main_view.handlebars            | 13 ++--
 .../templates/quick_links.handlebars          | 10 +--
 .../templates/saved_search.handlebars         |  4 +-
 ...on_concept_current_listing_view.handlebars |  2 +-
 .../taxon_concept_history_view.handlebars     |  6 +-
 ...xon_concept_listing_change_view.handlebars |  2 +-
 .../templates/taxon_concept_view.handlebars   | 14 ++--
 .../terms_of_use_header_view.handlebars       |  8 +--
 app/javascripts/views/appendix_form_view.js   |  4 +-
 app/javascripts/views/custom_search.js        |  6 +-
 .../views/timeline_event_list_view.js         | 14 ++--
 app/stylesheets/_listing.scss                 |  2 +-
 23 files changed, 143 insertions(+), 78 deletions(-)

diff --git a/app/javascripts/locales/en.js b/app/javascripts/locales/en.js
index 34832a1..979ad28 100644
--- a/app/javascripts/locales/en.js
+++ b/app/javascripts/locales/en.js
@@ -2,13 +2,76 @@ Em.I18n.locales = {};
 
 Em.I18n.locales.en = {
   'title': 'Checklist of CITES Species',
+  'about.title': 'About the CITES Checklist',
+  'terms.title': 'Terms of Use',
+  'toplink.about': 'About',
+  'toplink.terms': 'Terms of Use',
+  'powered.by': 'Powered By',
+
+  'search.by_taxon.button': 'SEARCH',
+  'search.by_taxon.placeholder': 'Species, higher taxon, synonym or common name...',
+  'search.by_appendix.all': 'All',
+  'search.by_appendix.appxs': 'Appxs.',
+
+  'search.by_location.placeholder': 'Type to filter countries or regions',
+  'search.by_location.selected': 'Selected Locations',
+  'search.by_location.regions': 'Regions',
+  'search.by_location.countries': 'Countries and territories',
+
+  'search.clear': 'Clear Search',
+  'search.no_results': 'Your search did not match any taxa.',
+  'search.results.page': 'Page',
+
+  'search.result.show_history': 'Show History',
+  'search.result.hide_history': 'Hide History',
+  'distribution.more.count': 'and {{count}} more.',
+  'distribution.see_all': 'See all...',
 
   'timeline.party': 'See reservations to CITES listings',
+  'timeline.split': 'NB: this taxon is split-listed. See also timeline(s) for lower taxa.',
+  'timeline.nohistory': 'No history information is available for this taxon.',
+  'timeline.reservations': 'Appendix-{{appendix}} reservations:',
+  'timeline.event.appendix': 'CITES Appendix {{appendix}}',
+  'timeline.event.symbol.amendment': 'A',
+  'timeline.event.symbol.reservation': 'R',
+  'timeline.event.symbol.reservation_withdrawal': 'W',
+  'timeline.event.description.addition': 'APPENDIX',
+  'timeline.event.description.reservation': 'RESERVATION',
+  'timeline.event.description.reservation_withdrawal': 'RESERVATION WITHDRAWAL',
 
+  'advanced.title': 'Advanced Options',
+  'advanced.common_names': 'COMMON NAMES',
+  'advanced.common_names.en': 'ENG',
+  'advanced.common_names.es': 'SPA',
+  'advanced.common_names.fr': 'FRE',
+  'advanced.online_view': 'Online view',
+  'advanced.online_view.alphabetical': 'Alphabetical',
+  'advanced.online_view.taxonomic': 'Taxonomic',
+  'advanced.online_view.appendix': 'Appendix',
+  'advanced.display': 'DISPLAY',
+  'advanced.display.synonyms': 'Synonyms',
+  'advanced.display.author_name': 'Author\'s name',
+  'advanced.display.unfold_history': 'History of listing',
+
+  'downloads.button': 'Download',
+  'downloads.popup.title': 'Download Taxa',
+  'downloads.popup.info': 'Please select the format of your choice',
+
+  'download.button': 'Download',
+  'download.failed': 'Failed.',
+  'download.remove': 'Remove?',
+  'download.spinner': 'Downloading...',
+
+  'saved_search.button': 'SAVE THIS',
   'saved_search.count.zero': '',
   'saved_search.count.one': '1 saved search',
   'saved_search.count.other': '{{count}} saved searches',
 
+  'featured.title': 'Featured',
+  'featured.index': 'Full species list',
+  'featured.history': 'History of listings',
+  'featured.format': 'Format',
+
   'locations.count.zero': 'All Locations',
   'locations.count.one': '1 Location',
   'locations.count.other': '{{count}} Locations',
@@ -29,4 +92,7 @@ Em.I18n.locales.en = {
   'reports.generating.title': 'Currently Generating Reportings',
   'reports.latest.title': 'Your report is being generated',
 
+  'splash.p1': 'CITES (the Convention on International Trade in Endangered Species of Wild Fauna and Flora) is an international agreement between governments that aims to ensure that international trade in specimens of wild animals and plants does not threaten their survival.',
+  'splash.p2': 'The Checklist of CITES Species allows the exploration of more than 35,000 species of animals and plants and their degree of protection.',
+  'splash.button': 'Start Exploring'
 };
diff --git a/app/javascripts/templates/about_header_view.handlebars b/app/javascripts/templates/about_header_view.handlebars
index 052b445..46f8bb4 100644
--- a/app/javascripts/templates/about_header_view.handlebars
+++ b/app/javascripts/templates/about_header_view.handlebars
@@ -3,13 +3,13 @@
     <div class="c1">
 
       <div class="logo-holder">
-        <h1 class="logo"><a href="/">Checklist of CITES Species</a></h1>
-        <a href="#" {{action "doTermsOfUse"}} class="top-links">Terms of Use</a>
-        <a href="#" {{action "doAbout"}} class="top-links">About</a>
+        <h1 class="logo"><a href="/">{{t title}}</a></h1>
+        <a href="#" {{action "doTermsOfUse"}} class="top-links">{{t toplink.terms}}</a>
+        <a href="#" {{action "doAbout"}} class="top-links">{{t toplink.about}}</a>
       </div>
 
       <div class="header-frame">
-        <h1>About the CITES Checklist</h1>
+        <h1>{{t about.title}}</h1>
       </div>
 
     </div>
diff --git a/app/javascripts/templates/application_view.handlebars b/app/javascripts/templates/application_view.handlebars
index f7653eb..35d0d5e 100644
--- a/app/javascripts/templates/application_view.handlebars
+++ b/app/javascripts/templates/application_view.handlebars
@@ -13,7 +13,7 @@
     </ul>
 
     <div class="powered-by">
-      Powered By
+      {{t powered.by}}
       <a href="http://www.unep-wcmc.org">
         <img src="/images/unep-wcmc-logo@2x.png" height="43" width="84" />
       </a>
diff --git a/app/javascripts/templates/checklist_form.handlebars b/app/javascripts/templates/checklist_form.handlebars
index a791382..559c4ca 100644
--- a/app/javascripts/templates/checklist_form.handlebars
+++ b/app/javascripts/templates/checklist_form.handlebars
@@ -6,12 +6,12 @@
           valueBinding="controllers.filtersController.scientificName"
           id="scientific_name"
           title="search"
-          placeholder="Species, higher taxon, synonym or common name..."
+          placeholderTranslation="search.by_taxon.placeholder"
           autocomplete="off"
         }}
       </div>
     </div>
-    <input type="submit" value="SEARCH" {{action "submit" target="view"}} />
+    <input type="submit" {{translateAttr value="search.by_taxon.button"}} {{action "submit" target="view"}} />
   </fieldset>
   <div class="drop" style="display: none;" id="autocomplete-dropdown">
     <img src="/images/decor-dropdown-light.png" alt="arrow for autocomplete dropdown box" class="decor" width="24" height="13" >
diff --git a/app/javascripts/templates/countries_list.handlebars b/app/javascripts/templates/countries_list.handlebars
index e258616..361f70c 100644
--- a/app/javascripts/templates/countries_list.handlebars
+++ b/app/javascripts/templates/countries_list.handlebars
@@ -3,9 +3,9 @@
     <span class="appendix_{{unbound this.species_listing_name}}_population">{{unbound this.name}}</span>
   {{/each}}
   {{#if view.showMore}}
-    and {{unbound view.count}} more.
+    {{t distribution.more.count countBinding="view.count"}}
     <a class="btn-saved">
-      See all...
+      {{t distribution.see_all }}
       <div class="drop">
         <div class="drop-holder">
           <ul>
diff --git a/app/javascripts/templates/custom_search.handlebars b/app/javascripts/templates/custom_search.handlebars
index 29f0639..6710ae4 100644
--- a/app/javascripts/templates/custom_search.handlebars
+++ b/app/javascripts/templates/custom_search.handlebars
@@ -1,10 +1,10 @@
 <div class="custom-holder">
-  <a href="#" class="btn-custom">Advanced Options</a>
+  <a href="#" class="btn-custom">{{t advanced.title}}</a>
   <div class="drop">
     <form action="#">
       <fieldset>
         <div class="row-holder">
-          <strong class="heading">COMMON NAMES</strong>
+          <strong class="heading">{{t advanced.common_names}}</strong>
           <div class="row">
               {{view Checklist.FilterCheckbox
                 context="showEnglish"
@@ -13,7 +13,7 @@
                 class="styled"
                 controllerBinding="controllers.filtersController"
               }}
-              <label for="eng-checkbox">ENG</label>
+              <label for="eng-checkbox">{{t advanced.common_names.en}}</label>
           </div>
           <div class="row">
             {{view Checklist.FilterCheckbox
@@ -23,7 +23,7 @@
               class="styled"
               controllerBinding="controllers.filtersController"
             }}
-            <label for="spa-checkbox">SPA</label>
+            <label for="spa-checkbox">{{t advanced.common_names.es}}</label>
           </div>
           <div class="row">
             {{view Checklist.FilterCheckbox
@@ -33,18 +33,18 @@
               class="styled"
               controllerBinding="controllers.filtersController"
             }}
-            <label for="fre-checkbox">FRE</label>
+            <label for="fre-checkbox">{{t advanced.common_names.fr}}</label>
           </div>
         </div>
 
         <div class="row-holder">
-          <strong class="heading">Online view</strong>
+          <strong class="heading">{{t advanced.online_view}}</strong>
           {{collection Checklist.SortingRadioButtons
             controllerBinding="controllers.filtersController"}}
         </div>
 
         <div class="row-holder style01">
-          <strong class="heading">DISPLAY</strong>
+          <strong class="heading">{{t advanced.display}}</strong>
           <div class="row">
             {{view Checklist.FilterCheckbox
               checkedBinding="controllers.filtersController.showSynonyms"
@@ -53,7 +53,7 @@
               class="styled"
               controllerBinding="controllers.filtersController"
             }}
-            <label for="synonyms-checkbox">Synonyms</label>
+            <label for="synonyms-checkbox">{{t advanced.display.synonyms}}</label>
           </div>
           <div class="row">
             {{view Checklist.FilterCheckbox
@@ -63,7 +63,7 @@
               class="styled"
               controllerBinding="controllers.filtersController"
             }}
-            <label for="author-checkbox">Author's name</label>
+            <label for="author-checkbox">{{t advanced.display.author_name}}</label>
           </div>
           <div class="row">
             {{view Checklist.UnfoldHistoryCheckbox
@@ -71,7 +71,7 @@
               id="history-checkbox"
               class="styled"
             }}
-            <label for="history-checkbox">History of listing</label>
+            <label for="history-checkbox">{{t advanced.display.unfold_history}}</label>
           </div>
         </div>
       </fieldset>
diff --git a/app/javascripts/templates/download_collection.handlebars b/app/javascripts/templates/download_collection.handlebars
index 53ac857..2c5cbbf 100644
--- a/app/javascripts/templates/download_collection.handlebars
+++ b/app/javascripts/templates/download_collection.handlebars
@@ -3,17 +3,17 @@
 <span class="info">{{unbound updated_at}}</span>
 <span class="button">
   {{#if view.isDownloadable}}
-    <a {{action "download" target="view" on="click"}} data-download-id="{{unbound id}}" href="#" class="btn red small">Download</a>
+    <a {{action "download" target="view" on="click"}} data-download-id="{{unbound id}}" href="#" class="btn red small">{{t download.button}}</a>
   {{else}}
     {{#if view.isFailed}}
     <span class="error">
-      Failed.
+      {{t download.failed}}
       <p>
-        <a href="#" {{action "deleteAndClose" target="view" on="click"}}>Remove?</a>
+        <a href="#" {{action "deleteAndClose" target="view" on="click"}}>{{t download.remove}}</a>
       </p>
     </span>
     {{else}}
-      <img src="/images/downloads-spinner.gif" alt="Downloading..." title="Downloading..." />
+      <img src="/images/downloads-spinner.gif" {{translateAttr title="download.spinner" alt="download.spinner"}} />
     {{/if}}
   {{/if}}
 </span>
diff --git a/app/javascripts/templates/download_view.handlebars b/app/javascripts/templates/download_view.handlebars
index f2abdeb..e1c0486 100644
--- a/app/javascripts/templates/download_view.handlebars
+++ b/app/javascripts/templates/download_view.handlebars
@@ -1,13 +1,13 @@
 <div class="btn-holder">
-  <a id="download-btn" class="btn red" href="#downloads">Download</a>
+  <a id="download-btn" class="btn red" href="#downloads">{{t downloads.button}}</a>
 
   <div style="display:none">
     <div id="downloads" class="lightbox downloads">
       <div class="heading-holder">
-        <strong class="heading">Download Taxa</strong>
+        <strong class="heading">{{t downloads.popup.title}}</strong>
       </div>
       <div class="text-holder">
-        Please select the format of your choice
+        {{t downloads.popup.info}}
 
         <p>
           <a href="#generating-download" {{action "download" target="view" on="click"}} data-format="pdf" data-doc-type="Index" id="download" class="btn red"><strong>PDF</strong></a>
diff --git a/app/javascripts/templates/kingdom_list_view.handlebars b/app/javascripts/templates/kingdom_list_view.handlebars
index 238110c..5712eb6 100644
--- a/app/javascripts/templates/kingdom_list_view.handlebars
+++ b/app/javascripts/templates/kingdom_list_view.handlebars
@@ -1,6 +1,6 @@
 {{#if view.isFiltered}}
   <div class="filter-control">
-    <a {{action "clearSearch" on="click" target="view"}} class="clear-search">X Clear Search</a>
+    <a {{action "clearSearch" on="click" target="view"}} class="clear-search">X {{t search.clear}}</a>
   </div>
 {{/if}}
 {{#if total_cnt}}
@@ -12,7 +12,7 @@
   {{/if}}
 {{else}}
   <div class="error-msg">
-    Your search did not match any taxa.
+    {{t search.no_results}}
   </div>
 {{/if}}
 
@@ -22,7 +22,7 @@
       <li><a class="btn-prev" href="#" {{action "prevPage" target="view" on="click"}}>&#9664;</a></li>
     {{/if}}
 
-    <li>Page {{view.currentPage}}/{{view.totalPages}}</li>
+    <li>{{t search.results.page}} {{view.currentPage}}/{{view.totalPages}}</li>
 
     {{# if view.showNext }}
       <li><a class="btn-next" href="#" {{action "nextPage" target="view" on="click"}}>&#9654;</a></li>
diff --git a/app/javascripts/templates/location_view.handlebars b/app/javascripts/templates/location_view.handlebars
index ab264fd..9e68392 100644
--- a/app/javascripts/templates/location_view.handlebars
+++ b/app/javascripts/templates/location_view.handlebars
@@ -8,13 +8,13 @@
           valueBinding="controllers.filtersController.geoEntityName"
           id="geo_entity_name"
           title="search"
-          placeholder="Type to filter countries or regions"
+          placeholderTranslation="search.by_location.placeholder"
           autocomplete="off"
         }}
       </fieldset>
 
       <div class="selected-locations">
-        <h3>Selected Locations</h3>
+        <h3>{{t search.by_location.selected}}</h3>
           {{collection Checklist.SelectedLocationsView
           contentBinding="controllers.filtersController.regions"
           locationType="regions"}}
@@ -25,12 +25,12 @@
     </div>
     <div class="drop-holder">
       <div class="scroll-area">
-        <h3>Regions</h3>
+        <h3>{{t search.by_location.regions}}</h3>
           {{collection Checklist.LocationsCollectionView
           contentBinding="controllers.filtersController.autoCompleteRegionsContent"
           locationType="regions"}}
 
-        <h3>Countries and territories</h3>
+        <h3>{{t search.by_location.countries}}</h3>
           {{collection Checklist.LocationsCollectionView
           contentBinding="controllers.filtersController.autoCompleteCountriesContent"
           locationType="countries"}}
diff --git a/app/javascripts/templates/main_header_view.handlebars b/app/javascripts/templates/main_header_view.handlebars
index a1a81a4..e0b18f4 100644
--- a/app/javascripts/templates/main_header_view.handlebars
+++ b/app/javascripts/templates/main_header_view.handlebars
@@ -4,8 +4,8 @@
 
       <div class="logo-holder">
         <h1 class="logo"><a href="/">{{t title}}</a></h1>
-        <a href="#" {{action "doTermsOfUse"}} class="top-links">Terms of Use</a>
-        <a href="#" {{action "doAbout"}} class="top-links">About</a>
+        <a href="#" {{action "doTermsOfUse"}} class="top-links">{{t toplink.terms}}</a>
+        <a href="#" {{action "doAbout"}} class="top-links">{{t toplink.about}}</a>
       </div>
 
       <div class="header-frame">
diff --git a/app/javascripts/templates/main_view.handlebars b/app/javascripts/templates/main_view.handlebars
index 7cd3f59..d562690 100644
--- a/app/javascripts/templates/main_view.handlebars
+++ b/app/javascripts/templates/main_view.handlebars
@@ -32,18 +32,15 @@
     <div class="text-holder">
       <div class="left-column">
         <p>
-          CITES (the Convention on International Trade in Endangered Species of
-          Wild Fauna and Flora) is an international agreement between
-          governments that aims to ensure that international trade in specimens
-          of wild animals and plants does not threaten their survival.
+          {{t splash.p1}}
         </p>
         <p>
-          The Checklist of CITES Species allows the exploration of more
-          than 35,000 species of animals and plants and their degree of
-          protection.
+          {{t splash.p2}}
         </p>
         <p>
-          <a href="#" {{action "closeLandingBox" target="view" on="click"}} class="btn">Start Exploring</a>
+          <a href="#" {{action "closeLandingBox" target="view" on="click"}} class="btn">
+            {{t splash.button}}
+          </a>
         </p>
       </div>
       <div class="image">
diff --git a/app/javascripts/templates/quick_links.handlebars b/app/javascripts/templates/quick_links.handlebars
index 78c42fe..9652ac9 100644
--- a/app/javascripts/templates/quick_links.handlebars
+++ b/app/javascripts/templates/quick_links.handlebars
@@ -1,10 +1,10 @@
 <div class="quick-links-holder">
-  <h3>Featured</h3>
+  <h3>{{t featured.title}}</h3>
   <ul class="quick-links">
     <li>
-      <a class="no-link" href="#">Full species list</a>
+      <a class="no-link" href="#">{{t featured.index}}</a>
       <div class="drop">
-        <h3>Format</h3>
+        <h3>{{t featured.format}}</h3>
 
         <ul>
           <li><a href="#" {{action "download" target="view" on="click"}} data-doc-type="index" data-format="pdf">PDF</a></li>
@@ -15,9 +15,9 @@
       </div>
     </li>
     <li>
-      <a class="no-link" href="#">History of listings</a>
+      <a class="no-link" href="#">{{t featured.history}}</a>
       <div class="drop">
-        <h3>Format</h3>
+        <h3>{{t featured.format}}</h3>
 
         <ul>
           <li><a href="#" {{action "download" target="view" on="click"}} data-doc-type="history" data-format="pdf">PDF</a></li>
diff --git a/app/javascripts/templates/saved_search.handlebars b/app/javascripts/templates/saved_search.handlebars
index 1a614b4..bb2905d 100644
--- a/app/javascripts/templates/saved_search.handlebars
+++ b/app/javascripts/templates/saved_search.handlebars
@@ -1,4 +1,6 @@
-<a href="#" {{action "save" target="view"}} class="btn"><span class="ico-star"></span>SAVE THIS</a>
+<a href="#" {{action "save" target="view"}} class="btn">
+  <span class="ico-star"></span>{{t saved_search.button}}
+</a>
 <fieldset class="saved-search">
   {{view Checklist.SavedSearchTextField
     filtersControllerBinding="controllers.filtersController"}}
diff --git a/app/javascripts/templates/taxon_concept_current_listing_view.handlebars b/app/javascripts/templates/taxon_concept_current_listing_view.handlebars
index 7ae23ec..0722049 100644
--- a/app/javascripts/templates/taxon_concept_current_listing_view.handlebars
+++ b/app/javascripts/templates/taxon_concept_current_listing_view.handlebars
@@ -16,7 +16,7 @@
 <div style="display: none">
   <div class="lightbox current-listing" id="current-listing-popup{{unbound id}}">
     <div class="heading-holder">
-      <strong class="heading">CITES Appendix {{current_listing}} <span class="parties">{{unbound view.current_parties}}</span></strong>
+      <strong class="heading">{{t timeline.event.appendix appendixBinding="current_listing"}}<span class="parties">{{unbound view.current_parties}}</span></strong>
     </div>
     <div class="text-holder">
       {{collection Checklist.TaxonConceptCurrentListingChangesListView contentBinding="current_additions"}}
diff --git a/app/javascripts/templates/taxon_concept_history_view.handlebars b/app/javascripts/templates/taxon_concept_history_view.handlebars
index 2c48582..2855882 100644
--- a/app/javascripts/templates/taxon_concept_history_view.handlebars
+++ b/app/javascripts/templates/taxon_concept_history_view.handlebars
@@ -1,6 +1,6 @@
 {{#unless has_events}}
   <div class="no-history-graphs">
-    No history information is available for this taxon.
+    {{t timeline.nohistory}}
   </div>
 {{/unless}}
 
@@ -17,7 +17,7 @@
       {{#each timelines}}
         {{#if hasNestedTimelines}}
           <div class="text-holder">
-            <span>Appendix-{{unbound appendix}} reservations:</span>
+            <span>{{t timeline.reservations appendixBinding="appendix"}}</span>
           </div>
           {{collection Checklist.TimelineView contentBinding="timelines"}}
           {{collection Checklist.TimelineYearListView contentBinding="view.content.timeline_years"}}
@@ -30,6 +30,6 @@
 
 {{#if has_descendant_timelines}}
   <div class="sub-timeline-note">
-    NB: this taxon is split-listed. See also timeline(s) for lower taxa.
+    {{t timeline.split}}
   </div>
 {{/if}}
\ No newline at end of file
diff --git a/app/javascripts/templates/taxon_concept_listing_change_view.handlebars b/app/javascripts/templates/taxon_concept_listing_change_view.handlebars
index c048ac2..9c1829c 100644
--- a/app/javascripts/templates/taxon_concept_listing_change_view.handlebars
+++ b/app/javascripts/templates/taxon_concept_listing_change_view.handlebars
@@ -1,6 +1,6 @@
 <div class="listing-section">
   <div class="listing-section-header">
-    <div class="appendix">CITES Appendix {{unbound species_listing_name}}</div>
+    <div class="appendix">{{t timeline.event.appendix appendixBinding="species_listing_name"}}</div>
     <div class="party">{{#if hasParty}}{{unbound party.name}}{{/if}}</div>
     <div class="effective_at">{{unbound effective_at}}</div>
   </div>
diff --git a/app/javascripts/templates/taxon_concept_view.handlebars b/app/javascripts/templates/taxon_concept_view.handlebars
index fd1b7b1..7999a7e 100644
--- a/app/javascripts/templates/taxon_concept_view.handlebars
+++ b/app/javascripts/templates/taxon_concept_view.handlebars
@@ -33,15 +33,15 @@
           {{/unless}}
           <ul class="default-list">
             {{#if view.showEnglish }}
-              <li>ENG - {{collection Checklist.TaxonConceptCommonNameView
+              <li>{{t advanced.common_names.en}} - {{collection Checklist.TaxonConceptCommonNameView
               contentBinding="view.english"}}</li>
             {{/if}}
             {{#if view.showSpanish }}
-              <li>SPA - {{collection Checklist.TaxonConceptCommonNameView
+              <li>{{t advanced.common_names.es}} - {{collection Checklist.TaxonConceptCommonNameView
               contentBinding="view.spanish"}}</li>
             {{/if}}
             {{#if view.showFrench }}
-              <li>FRE - {{collection Checklist.TaxonConceptCommonNameView
+              <li>{{t advanced.common_names.fr}} - {{collection Checklist.TaxonConceptCommonNameView
               contentBinding="view.french"}}</li>
             {{/if}}
           </ul>
@@ -82,12 +82,12 @@
   </div>
   <div class="opener-holder">
     <div class="opener">
-      Show History
-      <span>&#9660;</span>
+      {{t search.result.show_history}}
+      <span class="ico">&#9660;</span>
     </div>
     <div class="closer">
-      Hide History
-      <span>x</span>
+      {{t search.result.hide_history}}
+      <span class="ico">x</span>
     </div>
   </div>
   {{/unless}}
diff --git a/app/javascripts/templates/terms_of_use_header_view.handlebars b/app/javascripts/templates/terms_of_use_header_view.handlebars
index 1f8b494..3817adf 100644
--- a/app/javascripts/templates/terms_of_use_header_view.handlebars
+++ b/app/javascripts/templates/terms_of_use_header_view.handlebars
@@ -3,13 +3,13 @@
     <div class="c1">
 
       <div class="logo-holder">
-        <h1 class="logo"><a href="/">Checklist of CITES Species</a></h1>
-        <a href="#" {{action "doTermsOfUse"}} class="top-links">Terms of Use</a>
-        <a href="#" {{action "doAbout"}} class="top-links">About</a>
+        <h1 class="logo"><a href="/">{{t title}}</a></h1>
+        <a href="#" {{action "doTermsOfUse"}} class="top-links">{{t toplink.terms}}</a>
+        <a href="#" {{action "doAbout"}} class="top-links">{{t toplink.about}}</a>
       </div>
 
       <div class="header-frame">
-        <h1>Terms of Use</h1>
+        <h1>{{t terms.title}}</h1>
       </div>
 
     </div>
diff --git a/app/javascripts/views/appendix_form_view.js b/app/javascripts/views/appendix_form_view.js
index 4c97891..8dfa49f 100644
--- a/app/javascripts/views/appendix_form_view.js
+++ b/app/javascripts/views/appendix_form_view.js
@@ -19,12 +19,12 @@ Checklist.AppendixBtnView = Ember.View.extend({
         prefix = '';
 
     if (width > 1200) {
-      prefix = "All ";
+      prefix = Em.I18n.translations['search.by_appendix.all'] + ' ';
     }
 
     var appendices = this.get('content');
     if (appendices.length === 0 || appendices.length == 3) {
-      return prefix + "Appxs.";
+      return prefix + Em.I18n.translations['search.by_appendix.appxs'];
     } else {
       return appendices.sort().join(", ");
     }
diff --git a/app/javascripts/views/custom_search.js b/app/javascripts/views/custom_search.js
index c9bbd5b..2ac0893 100644
--- a/app/javascripts/views/custom_search.js
+++ b/app/javascripts/views/custom_search.js
@@ -57,13 +57,13 @@ Checklist.SortingRadioButtons = Ember.CollectionView.extend({
   grouping: Checklist.Helpers.generateId(),
 
   content: [{
-    name: 'Alphabetical',
+    name: Em.I18n.translations['advanced.online_view.alphabetical'],
     value: 'alphabetical'
   }, {
-    name: 'Taxonomic',
+    name: Em.I18n.translations['advanced.online_view.taxonomic'],
     value: 'taxonomic'
   }, {
-    name: 'Appendix',
+    name: Em.I18n.translations['advanced.online_view.appendix'],
     value: 'appendix'
   }],
 
diff --git a/app/javascripts/views/timeline_event_list_view.js b/app/javascripts/views/timeline_event_list_view.js
index 527fb90..43ddc26 100644
--- a/app/javascripts/views/timeline_event_list_view.js
+++ b/app/javascripts/views/timeline_event_list_view.js
@@ -35,11 +35,11 @@ Checklist.TimelineEventListView = Ember.CollectionView.extend({
       } else if (this.get('content.change_type_name') == 'DELETION'){
         return '-';
       } if (this.get('content.change_type_name') == 'RESERVATION'){
-        return 'R';
+        return Em.I18n.translations['timeline.event.symbol.reservation'];
       } if (this.get('content.change_type_name') == 'RESERVATION_WITHDRAWAL'){
-        return 'W';
+        return Em.I18n.translations['timeline.event.symbol.reservation_withdrawal'];
       } if (this.get('content.change_type_name') == 'AMENDMENT'){
-        return 'A';
+        return Em.I18n.translations['timeline.event.symbol.amendment'];
       }
     }.property(),
     eventClass: function() {
@@ -56,13 +56,13 @@ Checklist.TimelineEventListView = Ember.CollectionView.extend({
     eventDescription: function(){
       if (this.get('content.change_type_name') == 'ADDITION' ||
         this.get('content.change_type_name') == 'AMENDMENT'){
-        return 'APPENDIX ' + this.get('appendix');
+        return Em.I18n.translations['timeline.event.description.addition'] + this.get('appendix');
       } else if (this.get('content.change_type_name') == 'DELETION'){
-        return 'APPENDIX ' + this.get('appendix');
+        return Em.I18n.translations['timeline.event.description.addition'] + this.get('appendix');
       } else if (this.get('content.change_type_name') == 'RESERVATION'){
-        return 'RESERVATION';
+        return Em.I18n.translations['timeline.event.description.reservation'];
       } else if (this.get('content.change_type_name') == 'RESERVATION_WITHDRAWAL'){
-        return 'RESERVATION WITHDRAWAL';
+        return Em.I18n.translations['timeline.event.description.reservation_withdrawal'];
       }
     }.property(),
 
diff --git a/app/stylesheets/_listing.scss b/app/stylesheets/_listing.scss
index 5e7d9a8..cde8b2f 100644
--- a/app/stylesheets/_listing.scss
+++ b/app/stylesheets/_listing.scss
@@ -226,7 +226,7 @@ a.icons-link {
     text-transform: uppercase;
     font-weight: bold;
 
-    span {
+    span.ico {
       font-size: 0.7em;
       display: inline;
       height: 100%;

From 61c97470e9b1d3908b34224a8f3746ce4130a110 Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Wed, 12 Feb 2014 16:14:19 +0000
Subject: [PATCH 03/58] removed English stuff that I thought was not strictly
 necessary

---
 app/javascripts/templates/appendix_form.handlebars  | 2 +-
 app/javascripts/templates/checklist_form.handlebars | 2 +-
 app/javascripts/templates/custom_search.handlebars  | 2 +-
 app/javascripts/templates/location_view.handlebars  | 2 +-
 app/javascripts/templates/main_view.handlebars      | 2 +-
 app/javascripts/templates/quick_links.handlebars    | 4 ++--
 app/javascripts/templates/saved_search.handlebars   | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/javascripts/templates/appendix_form.handlebars b/app/javascripts/templates/appendix_form.handlebars
index c8f39bc..4dd9313 100644
--- a/app/javascripts/templates/appendix_form.handlebars
+++ b/app/javascripts/templates/appendix_form.handlebars
@@ -11,6 +11,6 @@
         taxonConceptControllerBinding="controllers.taxonConceptController"
       }}
     </div>
-    <img src="/images/decor-dropdown-dark.png" alt="image description" class="decor" width="24" height="13" >
+    <img src="/images/decor-dropdown-dark.png" class="decor" width="24" height="13" >
   </div>
 </div>
diff --git a/app/javascripts/templates/checklist_form.handlebars b/app/javascripts/templates/checklist_form.handlebars
index 559c4ca..6f70ad6 100644
--- a/app/javascripts/templates/checklist_form.handlebars
+++ b/app/javascripts/templates/checklist_form.handlebars
@@ -14,6 +14,6 @@
     <input type="submit" {{translateAttr value="search.by_taxon.button"}} {{action "submit" target="view"}} />
   </fieldset>
   <div class="drop" style="display: none;" id="autocomplete-dropdown">
-    <img src="/images/decor-dropdown-light.png" alt="arrow for autocomplete dropdown box" class="decor" width="24" height="13" >
+    <img src="/images/decor-dropdown-light.png" class="decor" width="24" height="13" >
   </div>
 </div>
diff --git a/app/javascripts/templates/custom_search.handlebars b/app/javascripts/templates/custom_search.handlebars
index 6710ae4..8eba3e3 100644
--- a/app/javascripts/templates/custom_search.handlebars
+++ b/app/javascripts/templates/custom_search.handlebars
@@ -76,6 +76,6 @@
         </div>
       </fieldset>
     </form>
-    <img src="/images/decor-dropdown-dark.png" alt="image description" class="decor" width="24" height="13" >
+    <img src="/images/decor-dropdown-dark.png" class="decor" width="24" height="13" >
   </div>
 </div>
diff --git a/app/javascripts/templates/location_view.handlebars b/app/javascripts/templates/location_view.handlebars
index 9e68392..85375d8 100644
--- a/app/javascripts/templates/location_view.handlebars
+++ b/app/javascripts/templates/location_view.handlebars
@@ -37,6 +37,6 @@
       </div>
       <div class="shadow"></div>
     </div>
-    <img src="/images/decor-dropdown-dark.png" alt="image description" class="decor" width="24" height="13" >
+    <img src="/images/decor-dropdown-dark.png" class="decor" width="24" height="13" >
   </div>
 </div>
diff --git a/app/javascripts/templates/main_view.handlebars b/app/javascripts/templates/main_view.handlebars
index d562690..cd7fc96 100644
--- a/app/javascripts/templates/main_view.handlebars
+++ b/app/javascripts/templates/main_view.handlebars
@@ -23,7 +23,7 @@
   </div>
 </div>
 
-<a href="#landing" id="landing-btn" style="display:none;">You can't see me</a>
+<a href="#landing" id="landing-btn" style="display:none;"></a>
 <div style="display:none">
   <div id="landing" class="lightbox landing">
     <div class="heading-holder">
diff --git a/app/javascripts/templates/quick_links.handlebars b/app/javascripts/templates/quick_links.handlebars
index 9652ac9..a1847bf 100644
--- a/app/javascripts/templates/quick_links.handlebars
+++ b/app/javascripts/templates/quick_links.handlebars
@@ -11,7 +11,7 @@
           <li><a href="#" {{action "download" target="view" on="click"}} data-doc-type="index" data-format="csv">CSV</a></li>
           <li><a href="#" {{action "download" target="view" on="click"}} data-doc-type="index" data-format="json">JSON</a></li>
         </ul>
-        <img src="/images/decor-dropdown-dark.png" alt="image description" class="decor" width="24" height="13" >
+        <img src="/images/decor-dropdown-dark.png" class="decor" width="24" height="13" >
       </div>
     </li>
     <li>
@@ -24,7 +24,7 @@
           <li><a href="#" {{action "download" target="view" on="click"}} data-doc-type="history" data-format="csv">CSV</a></li>
           <li><a href="#" {{action "download" target="view" on="click"}} data-doc-type="history" data-format="json">JSON</a></li>
         </ul>
-        <img src="/images/decor-dropdown-dark.png" alt="image description" class="decor" width="24" height="13" >
+        <img src="/images/decor-dropdown-dark.png" class="decor" width="24" height="13" >
       </div>
     </li>
   </ul>
diff --git a/app/javascripts/templates/saved_search.handlebars b/app/javascripts/templates/saved_search.handlebars
index bb2905d..2f7b7c1 100644
--- a/app/javascripts/templates/saved_search.handlebars
+++ b/app/javascripts/templates/saved_search.handlebars
@@ -14,7 +14,7 @@
       <div class="drop-holder">
         {{collection Checklist.SavedSearchCollectionView contentBinding="controllers.savedSearchController"}}
       </div>
-      <img src="/images/decor-dropdown-dark.png" alt="image description" class="decor" width="24" height="13" >
+      <img src="/images/decor-dropdown-dark.png" class="decor" width="24" height="13" >
     </div>
   </a>
 </div>

From a562c52fb5d92803dae60d1322727466fa50f2c5 Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Thu, 13 Feb 2014 08:36:59 +0000
Subject: [PATCH 04/58] added develop branch

---
 config/deploy/staging.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/deploy/staging.rb b/config/deploy/staging.rb
index 7b7ad71..f11f9e0 100644
--- a/config/deploy/staging.rb
+++ b/config/deploy/staging.rb
@@ -7,6 +7,7 @@
 set :server_name, "#{application}.unepwcmc-012.vm.brightbox.net"
 set :sudo_user, "rails"
 set :app_port, "80" 
+set :branch, :develop
 
 set :default_environment, {
   'PATH' => "/home/rails/.rvm/gems/ruby-1.9.2-p320/bin:/home/rails/.rvm/bin:/home/rails/.rvm/rubies/ruby-1.9.2-p320/bin:$PATH",

From 8223490925c5ae49fb11879026b5d6c892a43a5b Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Thu, 13 Feb 2014 09:27:59 +0000
Subject: [PATCH 05/58] fixed 'zero' plural form by adding a custom pluralizer

---
 app/javascripts/app.js               |  11 +-
 app/javascripts/config.js            |   1 -
 app/javascripts/locales/en.js        |   3 +
 app/javascripts/vendor/cldr-1.0.0.js | 240 ---------------------------
 4 files changed, 13 insertions(+), 242 deletions(-)
 delete mode 100644 app/javascripts/vendor/cldr-1.0.0.js

diff --git a/app/javascripts/app.js b/app/javascripts/app.js
index 0f711f8..4599b48 100644
--- a/app/javascripts/app.js
+++ b/app/javascripts/app.js
@@ -6,7 +6,16 @@ require('checklist/vendor/spin.min');
 require('checklist/vendor/ember');
 require('checklist/vendor/ember-data');
 
-require('checklist/vendor/cldr-1.0.0');
+// rather than include CLDR here, just a simple plural form implementation
+// EN, ES, FR only ever have 'one' or 'other'
+// 'zero' is for convenience
+
+CLDR = {
+  pluralForm: function myCustomInflector(n) {
+    return n === 0 ? 'zero' : n === 1 ? 'one' : 'other';
+  }
+};
+
 require('checklist/vendor/i18n');
 
 minispade.requireAll(/locales/);
diff --git a/app/javascripts/config.js b/app/javascripts/config.js
index 9b1fdba..91f4b11 100644
--- a/app/javascripts/config.js
+++ b/app/javascripts/config.js
@@ -40,4 +40,3 @@ Checklist.CONFIG = {
 
 Em.I18n.translations = Em.I18n.locales[Checklist.CONFIG.default_locale];
 Em.I18n.currentLocale = Checklist.CONFIG.default_locale;
-CLDR.defaultLanguage = Checklist.CONFIG.default_locale;
diff --git a/app/javascripts/locales/en.js b/app/javascripts/locales/en.js
index 979ad28..f3f636f 100644
--- a/app/javascripts/locales/en.js
+++ b/app/javascripts/locales/en.js
@@ -76,12 +76,15 @@ Em.I18n.locales.en = {
   'locations.count.one': '1 Location',
   'locations.count.other': '{{count}} Locations',
 
+  'reports.count.zero': '',
   'reports.count.one': 'Generating 1 report',
   'reports.count.other': 'Generating {{count}} reports',
 
+  'reports.ready.count.zero': '',
   'reports.ready.count.one': '1 report ready',
   'reports.ready.count.other': '{{count}} reports ready',
 
+  'reports.failed.count.zero': '',
   'reports.failed.count.one': '1 report failed',
   'reports.failed.count.other': '{{count}} reports failed',
 
diff --git a/app/javascripts/vendor/cldr-1.0.0.js b/app/javascripts/vendor/cldr-1.0.0.js
deleted file mode 100644
index 6b6e9ca..0000000
--- a/app/javascripts/vendor/cldr-1.0.0.js
+++ /dev/null
@@ -1,240 +0,0 @@
-(function(globals) {
-
-  // CLDR Pluralization Data
-  // see http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html
-
-  // The six plural forms. Not all languages use all six forms.
-  var Zero = 'zero',
-      One = 'one',
-      Two = 'two',
-      Few = 'few',
-      Many = 'many',
-      Other = 'other',
-      Data = {};
-
-  function isInt(value) {
-    return value << 0 === value;
-  }
-
-  function isAmong(value, array) {
-    for ( var i = 0; i < array.length; ++i ) {
-      if (array[i] === value) { return true; }
-    }
-    return false;
-  }
-
-  function defineLanguageRule(languages, rule) {
-    for ( var i = 0; i < languages.length; ++i ) {
-      Data[ languages[i] ] = rule;
-    }
-  }
-
-  defineLanguageRule([
-    'az', 'bm', 'my', 'zh', 'dz', 'ka', 'hu', 'ig', 'id', 'ja', 'jv', 'kea',
-    'kn', 'km', 'ko', 'ses', 'lo', 'kde', 'ms', 'fa', 'root', 'sah', 'sg',
-    'ii', 'th', 'bo', 'to', 'tr', 'vi', 'wo', 'yo'
-  ], function(n) {
-    return Other;
-  });
-
-  defineLanguageRule([ 'gv' ], function(n) {
-    if ( isAmong(n % 10, [ 1, 2 ]) || n % 20 === 0 ) { return One; }
-    return Other;
-  });
-
-  defineLanguageRule([ 'tzm' ], function(n) {
-    if ( n === 0 || n === 1 ) { return One; }
-    if ( isInt(n) && n >= 11 && n <= 99 ) { return One; }
-    return Other;
-  });
-
-  defineLanguageRule([ 'mk' ], function(n) {
-    return n % 10 === 1 && n !== 11 ? One : Other;
-  });
-
-  defineLanguageRule([ 'fr', 'ff', 'kab' ], function(n) {
-    return n >= 0 && n < 2 ? One : Other;
-  });
-
-  defineLanguageRule([
-    'ak', 'am', 'bh', 'fil', 'guw', 'hi', 'ln', 'mg', 'nso', 'tl', 'ti', 'wa'
-  ], function(n) {
-    return n === 0 || n === 1 ? One : Other;
-  });
-
-  defineLanguageRule([
-    'af', 'sq', 'eu', 'bem', 'bn', 'brx', 'bg', 'ca', 'chr', 'cgg', 'da', 'dv',
-    'nl', 'en', 'eo', 'et', 'ee', 'fo', 'fi', 'fur', 'gl', 'lg', 'de', 'el',
-    'gu', 'ha', 'haw', 'he', 'is', 'it', 'kl', 'kk', 'ku', 'lb', 'ml', 'mr',
-    'mas', 'mn', 'nah', 'ne', 'no', 'nb', 'nn', 'nyn', 'or', 'om', 'pap', 'ps',
-    'pt', 'pa', 'rm', 'ssy', 'saq', 'xog', 'so', 'es', 'sw', 'sv', 'gsw',
-    'syr', 'ta', 'te', 'tk', 'ur', 'wae', 'fy', 'zu'
-  ], function(n) {
-    return n === 1 ? One : Other;
-  });
-
-  defineLanguageRule([ 'lv' ], function(n) {
-    if (n === 0) { return Zero; }
-    if (n % 10 === 1 && n % 100 !== 11) { return One; }
-    return Other;
-  });
-
-  defineLanguageRule([ 'ksh' ], function(n) {
-    if (n === 0) { return Zero; }
-    if (n === 1) { return One; }
-    return Other;
-  });
-
-  defineLanguageRule([ 'lag' ], function(n) {
-    if (n === 0) { return Zero; }
-    if (n > 0 && n < 2) { return One; }
-    return Other;
-  });
-
-  defineLanguageRule([
-    'kw', 'smn', 'iu', 'ga', 'smj', 'se', 'smi', 'sms', 'sma'
-  ], function(n) {
-    if (n === 1) { return One; }
-    if (n === 2) { return Two; }
-    return Other;
-  });
-
-  defineLanguageRule([
-    'be', 'bs', 'hr', 'ru', 'sr', 'sh', 'uk'
-  ], function(n) {
-    var mod10  = n % 10,
-        mod100 = n % 100;
-
-    if ( mod10 === 1 && n % 100 !== 11 ) { return One; }
-
-    if ( isAmong(mod10, [ 2, 3, 4 ]) &&
-         !isAmong(mod100, [ 12, 13, 14 ]) ) { return Few; }
-
-    if ( isAmong(mod10, [ 0, 5, 6, 7, 8, 9 ]) ||
-         isAmong(mod100, [ 11, 12, 13, 14 ]) ) { return Many; }
-
-    return Other;
-  });
-
-  defineLanguageRule([ 'pl' ], function(n) {
-    var mod10  = n % 10,
-        mod100 = n % 100;
-
-    if ( n === 1 ) { return One; }
-
-    if ( isAmong(mod10, [ 2, 3, 4 ]) &&
-         !isAmong(mod100, [ 12, 13, 14 ]) ) { return Few; }
-
-    if ( isAmong(mod10, [ 0, 1, 5, 6, 7, 8, 9 ]) ||
-         isAmong(mod100, [ 12, 13, 14 ]) ) { return Many; }
-
-    return Other;
-  });
-
-  defineLanguageRule([ 'lt' ], function(n) {
-    var mod10  = n % 10,
-        mod100 = n % 100;
-
-    if ( mod10 === 1 && mod100 !== 11 ) { return One; }
-
-    if ( isInt(n) &&
-         mod10 >= 2 && mod10 <= 9 &&
-         mod100 >= 12 && mod100 <= 19 ) { return Few; }
-
-    return Other;
-  });
-
-  defineLanguageRule([ 'shi' ], function(n) {
-    if ( n >= 0 && n <= 1 ) { return One; }
-    if ( isInt(n) && n >= 2 && n <= 9 ) { return Few; }
-    return Other;
-  });
-
-  defineLanguageRule([ 'mo', 'ro' ], function(n) {
-    var mod100 = n % 100;
-
-    if ( n === 1 ) { return One; }
-
-    if ( n === 0 ||
-         (isInt(n) && mod100 >= 1 && mod100 <= 19) ) { return Few; }
-
-    return Other;
-  });
-
-  defineLanguageRule([ 'cs', 'sk' ], function(n) {
-    if ( n === 1 ) { return One; }
-    if ( isAmong(n, [ 2, 3, 4 ]) ) { return Few; }
-    return Other;
-  });
-
-  defineLanguageRule([ 'sl' ], function(n) {
-    var mod100 = n % 100;
-    if ( mod100 === 1 ) { return One; }
-    if ( mod100 === 2 ) { return Two; }
-    if ( mod100 === 3 || mod100 === 4 ) { return Few; }
-    return Other;
-  });
-
-  defineLanguageRule([ 'mt' ], function(n) {
-    if ( n === 1 ) { return One; }
-    var mod100 = n % 100;
-    if ( isInt(mod100) && mod100 >= 2 && mod100 <= 10 ) { return Few; }
-    if ( isInt(mod100) && mod100 >= 11 && mod100 <= 19 ) { return Many; }
-    return Other;
-  });
-
-  defineLanguageRule([ 'ar' ], function(n) {
-    if ( n === 0 ) { return Zero; }
-    if ( n === 1 ) { return One; }
-    if ( n === 2 ) { return Two; }
-    var mod100 = n % 100;
-    if ( isInt(mod100) && mod100 >= 3 && mod100 <= 10 ) { return Few; }
-    if ( isInt(mod100) && mod100 >= 11 && mod100 <= 99 ) { return Many; }
-    return Other;
-  });
-
-  defineLanguageRule([ 'br', 'cy' ], function(n) {
-    switch ( n ) {
-      case 0: return Zero;
-      case 1: return One;
-      case 2: return Two;
-      case 3: return Few;
-      case 6: return Many;
-      default: return Other;
-    }
-  });
-
-  if ( globals.CLDR == null ) { globals.CLDR = {}; }
-
-  var CLDR = globals.CLDR;
-
-  // Look up the proper plural key for a count and language.
-  // If CLDR.defaultLanguage is set, language is optional.
-  //
-  // For example:
-  //
-  //     CLDR.pluralForm(0, 'en');     // => 'other'
-  //     CLDR.pluralForm(1, 'en-US');  // => 'one'
-  //     CLDR.pluralForm(2.383, 'fr'); // => 'other'
-  //     CLDR.pluralForm(1, 'zh');     // => 'other'
-  //     CLDR.pluralForm(26, 'uk');    // => 'many'
-  //
-  // @return [String] the proper key (one of `CLDR.pluralForm.Zero`,
-  //   `.One`, `.Two`, `.Few`, `.Many`, or `.Other`).
-  CLDR.pluralForm = function(count, language) {
-    if (count == null) { throw new Error("CLDR.pluralForm requires a count"); }
-    language = language || CLDR.defaultLanguage;
-    if (language == null) { throw new Error("CLDR.pluralForm requires a language"); }
-    language = language.replace(/^(\w\w\w?)-?.*/, "$1");
-    if (Data[language] == null) { throw new Error("No CLDR pluralization information for " + language); }
-    return Data[language].call(CLDR, +count);
-  };
-
-  CLDR.pluralForm.Zero  = Zero;
-  CLDR.pluralForm.One   = One;
-  CLDR.pluralForm.Two   = Two;
-  CLDR.pluralForm.Few   = Few;
-  CLDR.pluralForm.Many  = Many;
-  CLDR.pluralForm.Other = Other;
-
-}(this));

From b9f16bbc46005cb644797eb09141f73fb371318a Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Thu, 13 Feb 2014 09:28:28 +0000
Subject: [PATCH 06/58] no inflection here, so the 'count' suffix was confusing

---
 app/javascripts/locales/en.js                       | 2 +-
 app/javascripts/templates/countries_list.handlebars | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascripts/locales/en.js b/app/javascripts/locales/en.js
index f3f636f..919a08e 100644
--- a/app/javascripts/locales/en.js
+++ b/app/javascripts/locales/en.js
@@ -24,7 +24,7 @@ Em.I18n.locales.en = {
 
   'search.result.show_history': 'Show History',
   'search.result.hide_history': 'Hide History',
-  'distribution.more.count': 'and {{count}} more.',
+  'distribution.more': 'and {{count}} more.',
   'distribution.see_all': 'See all...',
 
   'timeline.party': 'See reservations to CITES listings',
diff --git a/app/javascripts/templates/countries_list.handlebars b/app/javascripts/templates/countries_list.handlebars
index 361f70c..c5f3f11 100644
--- a/app/javascripts/templates/countries_list.handlebars
+++ b/app/javascripts/templates/countries_list.handlebars
@@ -3,7 +3,7 @@
     <span class="appendix_{{unbound this.species_listing_name}}_population">{{unbound this.name}}</span>
   {{/each}}
   {{#if view.showMore}}
-    {{t distribution.more.count countBinding="view.count"}}
+    {{t distribution.more countBinding="view.count"}}
     <a class="btn-saved">
       {{t distribution.see_all }}
       <div class="drop">

From 6c071a96d48710401acea8a7efcc932cf59a1169 Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Thu, 13 Feb 2014 09:35:55 +0000
Subject: [PATCH 07/58] fixed placeholder translations

---
 app/javascripts/views/checklist_form.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/javascripts/views/checklist_form.js b/app/javascripts/views/checklist_form.js
index 3c6117a..2491739 100644
--- a/app/javascripts/views/checklist_form.js
+++ b/app/javascripts/views/checklist_form.js
@@ -112,6 +112,8 @@ Checklist.SearchTextField = Em.TextField.extend({
   }
 });
 
+Checklist.SearchTextField.reopen(Em.I18n.TranslateableAttributes);
+
 /*
  * An extended TextField for use in location search.
  *
@@ -169,3 +171,5 @@ Checklist.GeoEntityTextField = Em.TextField.extend({
     }
   }
 });
+
+Checklist.GeoEntityTextField.reopen(Em.I18n.TranslateableAttributes);

From 01a0c1131dbf3d1b81313ac4247d82edfa46a339 Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Thu, 13 Feb 2014 12:19:34 +0000
Subject: [PATCH 08/58] fixed the save search functionality broken by
 translation span element

---
 app/javascripts/views/saved_search_view.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/javascripts/views/saved_search_view.js b/app/javascripts/views/saved_search_view.js
index 38ea220..2368113 100644
--- a/app/javascripts/views/saved_search_view.js
+++ b/app/javascripts/views/saved_search_view.js
@@ -14,9 +14,10 @@ Checklist.SavedSearchView = Em.View.extend({
     // Ember's inheritance isn't ideal for this situation, so
     // unfortunately we don't get to use the fancy isInvisible and
     // beforeInvisible, etc. methods.
-    $(view.target).hide();
-    $(view.target).siblings('fieldset').fadeIn();
-    $(view.target).siblings('fieldset').find('input').focus();
+    var el = $(view.target).parent();
+    el.hide();
+    el.siblings('fieldset').fadeIn();
+    el.siblings('fieldset').find('input').focus();
   }
 });
 

From 00a440f35346bdfe41ed0f3487e71a0893fa694e Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Thu, 13 Feb 2014 12:20:16 +0000
Subject: [PATCH 09/58] removed a css rule that was breaking things and
 hopefully wasn't too important

---
 app/stylesheets/checklist.scss | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/stylesheets/checklist.scss b/app/stylesheets/checklist.scss
index 6c36dc1..32eff8f 100644
--- a/app/stylesheets/checklist.scss
+++ b/app/stylesheets/checklist.scss
@@ -835,10 +835,6 @@ ul.quick-links {
     font-weight:bold;
     color:#33526a;
     padding:0 0 3px;
-
-    span {
-      font-weight:normal;
-    }
   }
 
   .text-holder{

From 73e5ad94924d607877202c522e0ff488a32686bd Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Thu, 13 Feb 2014 12:20:51 +0000
Subject: [PATCH 10/58] upgraded rake pipeline to stop the annoying errors in
 log

---
 Gemfile.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e5c7092..8c7eba1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,15 +1,15 @@
 GIT
   remote: https://github.com/livingsocial/rake-pipeline.git
-  revision: ee992cbcda5172075062be035bcbef2cf1b0ff5d
+  revision: a75d96fbadcc659a35a0ae59212e0bc60b58cc54
   specs:
     rake-pipeline (0.8.0)
       json
-      rake (~> 10.0.0)
+      rake (~> 10.1.0)
       thor
 
 GIT
   remote: https://github.com/wycats/rake-pipeline-web-filters.git
-  revision: d83f54cc0d4e53f9833c31851964e3d8ba00f66a
+  revision: de71c66b5a92e304c244ab35d351d9b8eea002df
   specs:
     rake-pipeline-web-filters (0.6.0)
       rack
@@ -36,7 +36,7 @@ GEM
     fssm (0.2.10)
     highline (1.6.19)
     jslint_on_rails (1.1.1)
-    json (1.7.7)
+    json (1.8.1)
     libv8 (3.11.8.13)
     multi_json (1.5.1)
     net-scp (1.1.2)
@@ -47,13 +47,13 @@ GEM
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
     rack (1.5.2)
-    rake (10.0.3)
+    rake (10.1.1)
     ref (1.0.2)
     sass (3.2.5)
     therubyracer (0.11.3)
       libv8 (~> 3.11.8.12)
       ref
-    thor (0.17.0)
+    thor (0.18.1)
     uglifier (1.3.0)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)

From 7e4197bd8759791f9dfec591bec27a46d11c6de3 Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Mon, 17 Feb 2014 11:06:14 +0000
Subject: [PATCH 11/58] replaced lookups on the translations hash by calls to t

---
 app/javascripts/views/appendix_form_view.js       |  4 ++--
 app/javascripts/views/custom_search.js            |  6 +++---
 app/javascripts/views/timeline_event_list_view.js | 14 +++++++-------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/javascripts/views/appendix_form_view.js b/app/javascripts/views/appendix_form_view.js
index 8dfa49f..e9a0674 100644
--- a/app/javascripts/views/appendix_form_view.js
+++ b/app/javascripts/views/appendix_form_view.js
@@ -19,12 +19,12 @@ Checklist.AppendixBtnView = Ember.View.extend({
         prefix = '';
 
     if (width > 1200) {
-      prefix = Em.I18n.translations['search.by_appendix.all'] + ' ';
+      prefix = Em.I18n.t('search.by_appendix.all') + ' ';
     }
 
     var appendices = this.get('content');
     if (appendices.length === 0 || appendices.length == 3) {
-      return prefix + Em.I18n.translations['search.by_appendix.appxs'];
+      return prefix + Em.I18n.t('search.by_appendix.appxs');
     } else {
       return appendices.sort().join(", ");
     }
diff --git a/app/javascripts/views/custom_search.js b/app/javascripts/views/custom_search.js
index 2ac0893..97910d9 100644
--- a/app/javascripts/views/custom_search.js
+++ b/app/javascripts/views/custom_search.js
@@ -57,13 +57,13 @@ Checklist.SortingRadioButtons = Ember.CollectionView.extend({
   grouping: Checklist.Helpers.generateId(),
 
   content: [{
-    name: Em.I18n.translations['advanced.online_view.alphabetical'],
+    name: Em.I18n.t('advanced.online_view.alphabetical'),
     value: 'alphabetical'
   }, {
-    name: Em.I18n.translations['advanced.online_view.taxonomic'],
+    name: Em.I18n.t('advanced.online_view.taxonomic'),
     value: 'taxonomic'
   }, {
-    name: Em.I18n.translations['advanced.online_view.appendix'],
+    name: Em.I18n.t('advanced.online_view.appendix'),
     value: 'appendix'
   }],
 
diff --git a/app/javascripts/views/timeline_event_list_view.js b/app/javascripts/views/timeline_event_list_view.js
index 43ddc26..4ca112b 100644
--- a/app/javascripts/views/timeline_event_list_view.js
+++ b/app/javascripts/views/timeline_event_list_view.js
@@ -35,11 +35,11 @@ Checklist.TimelineEventListView = Ember.CollectionView.extend({
       } else if (this.get('content.change_type_name') == 'DELETION'){
         return '-';
       } if (this.get('content.change_type_name') == 'RESERVATION'){
-        return Em.I18n.translations['timeline.event.symbol.reservation'];
+        return Em.I18n.t('timeline.event.symbol.reservation');
       } if (this.get('content.change_type_name') == 'RESERVATION_WITHDRAWAL'){
-        return Em.I18n.translations['timeline.event.symbol.reservation_withdrawal'];
+        return Em.I18n.t('timeline.event.symbol.reservation_withdrawal');
       } if (this.get('content.change_type_name') == 'AMENDMENT'){
-        return Em.I18n.translations['timeline.event.symbol.amendment'];
+        return Em.I18n.t('timeline.event.symbol.amendment');
       }
     }.property(),
     eventClass: function() {
@@ -56,13 +56,13 @@ Checklist.TimelineEventListView = Ember.CollectionView.extend({
     eventDescription: function(){
       if (this.get('content.change_type_name') == 'ADDITION' ||
         this.get('content.change_type_name') == 'AMENDMENT'){
-        return Em.I18n.translations['timeline.event.description.addition'] + this.get('appendix');
+        return Em.I18n.t('timeline.event.description.addition') + this.get('appendix');
       } else if (this.get('content.change_type_name') == 'DELETION'){
-        return Em.I18n.translations['timeline.event.description.addition'] + this.get('appendix');
+        return Em.I18n.t('timeline.event.description.addition') + this.get('appendix');
       } else if (this.get('content.change_type_name') == 'RESERVATION'){
-        return Em.I18n.translations['timeline.event.description.reservation'];
+        return Em.I18n.t('timeline.event.description.reservation');
       } else if (this.get('content.change_type_name') == 'RESERVATION_WITHDRAWAL'){
-        return Em.I18n.translations['timeline.event.description.reservation_withdrawal'];
+        return Em.I18n.t('timeline.event.description.reservation_withdrawal');
       }
     }.property(),
 

From 647782f569d97b5df94296430bed31393f7a7489 Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Mon, 17 Feb 2014 11:06:37 +0000
Subject: [PATCH 12/58] fixed issue with downloading generated files

---
 app/javascripts/views/download_collection_view.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascripts/views/download_collection_view.js b/app/javascripts/views/download_collection_view.js
index 4c0ab41..321b2ec 100644
--- a/app/javascripts/views/download_collection_view.js
+++ b/app/javascripts/views/download_collection_view.js
@@ -21,7 +21,7 @@ Checklist.DownloadCollectionView = Ember.CollectionView.extend({
     }.property(),
 
     download: function(event) {
-      var id = $(event.target).attr('data-download-id');
+      var id = $(event.target).parent().attr('data-download-id');
       window.location = Checklist.Download.downloadUrl(id);
       $.colorbox.close();
     },

From a678cbba2fba27196111a7bc58348b038ea6d358 Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Mon, 17 Feb 2014 16:16:51 +0000
Subject: [PATCH 13/58] [#65555822] localise annotations

---
 app/javascripts/models/listing_change.js      | 12 ++++----
 ...xon_concept_listing_change_view.handlebars | 28 +++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/app/javascripts/models/listing_change.js b/app/javascripts/models/listing_change.js
index bdaf42b..40ecaa7 100644
--- a/app/javascripts/models/listing_change.js
+++ b/app/javascripts/models/listing_change.js
@@ -6,17 +6,17 @@ Checklist.ListingChange = DS.Model.extend({
   change_type_name: DS.attr('string'),
   effective_at: DS.attr('string', { key: 'effective_at_formatted' }),
   auto_note: DS.attr('string'),
-  short_note_en: DS.attr('string'),
-  full_note_en: DS.attr('string'),
-  hash_full_note_en: DS.attr('string'),
+  short_note: DS.attr('string'),
+  full_note: DS.attr('string'),
+  hash_full_note: DS.attr('string'),
   hash_ann_symbol:DS.attr('string'),
   hash_ann_parent_symbol: DS.attr('string'),
-  inherited_short_note_en: DS.attr('string'),
-  inherited_full_note_en: DS.attr('string'),
+  inherited_short_note: DS.attr('string'),
+  inherited_full_note: DS.attr('string'),
   hasParty: function(){
     return (this.get('party') !== null);
   }.property(),
   hasInheritedNote: function(){
-    return (this.get('inherited_full_note_en') !== null || this.get('inherited_short_note_en') !== null);
+    return (this.get('inherited_full_note') !== null || this.get('inherited_short_note') !== null);
   }.property()
 });
diff --git a/app/javascripts/templates/taxon_concept_listing_change_view.handlebars b/app/javascripts/templates/taxon_concept_listing_change_view.handlebars
index 9c1829c..4e7ffb5 100644
--- a/app/javascripts/templates/taxon_concept_listing_change_view.handlebars
+++ b/app/javascripts/templates/taxon_concept_listing_change_view.handlebars
@@ -9,11 +9,11 @@
       <!-- inclusion records have a combined inherited + own note -->
       <!-- own note first -->
       <p>
-        {{#if full_note_en}}
-          <p class="long-note">{{{unbound full_note_en}}}</p>
+        {{#if full_note}}
+          <p class="long-note">{{{unbound full_note}}}</p>
         {{else}}
-          {{#if short_note_en}}
-            <p class="short-note">{{{unbound short_note_en}}}</p>
+          {{#if short_note}}
+            <p class="short-note">{{{unbound short_note}}}</p>
           {{/if}}
         {{/if}}
       </p>
@@ -21,11 +21,11 @@
       {{#if auto_note}}
         <p>{{unbound auto_note}}</p>
       {{/if}}
-      {{#if inherited_full_note_en}}
-        <p class="long-note">{{{unbound inherited_full_note_en}}}</p>
+      {{#if inherited_full_note}}
+        <p class="long-note">{{{unbound inherited_full_note}}}</p>
       {{else}}
-        {{#if inherited_short_note_en}}
-          <p class="short-note">{{{unbound inherited_short_note_en}}}</p>
+        {{#if inherited_short_note}}
+          <p class="short-note">{{{unbound inherited_short_note}}}</p>
         {{/if}}
       {{/if}}
     {{else}}
@@ -33,18 +33,18 @@
       {{#if auto_note}}
         <p>{{unbound auto_note}}</p>
       {{/if}}
-      {{#if full_note_en}}
-        <p class="long-note">{{{unbound full_note_en}}}</p>
+      {{#if full_note}}
+        <p class="long-note">{{{unbound full_note}}}</p>
       {{else}}
-        {{#if short_note_en}}
-          <p class="short-note">{{{unbound short_note_en}}}</p>
+        {{#if short_note}}
+          <p class="short-note">{{{unbound short_note}}}</p>
         {{/if}}
       {{/if}}
     {{/if}}
 
     <p class="short-note">{{unbound hash_ann_symbol}}{{unbound hash_ann_parent_symbol}}</p>
-    {{#if hash_full_note_en}}
-    <p class="long-note">{{{unbound hash_full_note_en}}}</p>
+    {{#if hash_full_note}}
+    <p class="long-note">{{{unbound hash_full_note}}}</p>
     {{/if}}
   </div>
 </div>

From 1494fb0b669f2d0ff19867e11b339b378fbe5c52 Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Thu, 6 Mar 2014 08:44:34 +0000
Subject: [PATCH 14/58] [#63877218] pass checklict visibility params

---
 app/javascripts/views/checklist_form.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/javascripts/views/checklist_form.js b/app/javascripts/views/checklist_form.js
index 2491739..4431fba 100644
--- a/app/javascripts/views/checklist_form.js
+++ b/app/javascripts/views/checklist_form.js
@@ -35,6 +35,7 @@ Checklist.SearchTextField = Em.TextField.extend({
     var params = {
       param_name: 'scientific_name',
       value: event.value,
+      visibility: 'checklist',
       per_page: 10
     };
 

From a7554047c75073405746831758ba8cad0de90673 Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Fri, 14 Mar 2014 14:03:56 +0000
Subject: [PATCH 15/58] [#65556010] pass intro param to backend

---
 app/javascripts/controllers/filters_controller.js  | 1 +
 app/javascripts/locales/en.js                      | 2 ++
 app/javascripts/templates/download_view.handlebars | 3 +++
 app/javascripts/views/download_view.js             | 4 +++-
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/javascripts/controllers/filters_controller.js b/app/javascripts/controllers/filters_controller.js
index d65c4d9..c229a39 100644
--- a/app/javascripts/controllers/filters_controller.js
+++ b/app/javascripts/controllers/filters_controller.js
@@ -121,6 +121,7 @@ Checklist.FiltersController = Ember.Object.extend({
       show_english : 1,
       show_spanish : 1,
       show_french : 1,
+      intro : 1,
       locale : Em.I18n.currentLocale
     };
   },
diff --git a/app/javascripts/locales/en.js b/app/javascripts/locales/en.js
index 919a08e..a76ba10 100644
--- a/app/javascripts/locales/en.js
+++ b/app/javascripts/locales/en.js
@@ -52,6 +52,8 @@ Em.I18n.locales.en = {
   'advanced.display.synonyms': 'Synonyms',
   'advanced.display.author_name': 'Author\'s name',
   'advanced.display.unfold_history': 'History of listing',
+  'advanced.downloads': 'Downloads',
+  'advanced.downloads.include_intro':  'Include introduction in PDF',
 
   'downloads.button': 'Download',
   'downloads.popup.title': 'Download Taxa',
diff --git a/app/javascripts/templates/download_view.handlebars b/app/javascripts/templates/download_view.handlebars
index e1c0486..4801a55 100644
--- a/app/javascripts/templates/download_view.handlebars
+++ b/app/javascripts/templates/download_view.handlebars
@@ -14,6 +14,9 @@
           <a href="#generating-download" {{action "download" target="view" on="click"}} data-format="csv" data-doc-type="Index" id="download" class="btn red"><strong>CSV</strong></a>
           <a href="#generating-download" {{action "download" target="view" on="click"}} data-format="json" data-doc-type="Index" id="download" class="btn red"><strong>JSON</strong></a>
         </p>
+
+        <input id="include-intro" type="checkbox" checked="checked">
+        <label for="author-checkbox">{{t advanced.downloads.include_intro}}</label>
       </div>
     </div>
   </div>
diff --git a/app/javascripts/views/download_view.js b/app/javascripts/views/download_view.js
index e8c1e8d..87aff52 100644
--- a/app/javascripts/views/download_view.js
+++ b/app/javascripts/views/download_view.js
@@ -40,7 +40,9 @@ Checklist.DownloadView = Em.View.extend({
         download: {
           doc_type: doc_type.toLowerCase(),
           format: format.toLowerCase()
-      }}, params)
+        },
+        intro: $('#include-intro').is(':checked')
+      }, params)
     );
   },
 

From b3f5171a2c0d182cf138064c9d2e0eecd5401ac3 Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Tue, 18 Mar 2014 22:39:29 +0000
Subject: [PATCH 16/58] [#65553094] added locale switch

---
 app/javascripts/app.js                        |   2 +
 app/javascripts/locales/en.js                 |   5 +-
 app/javascripts/locales/es.js                 | 104 ++++++++++++++++++
 app/javascripts/locales/fr.js                 | 104 ++++++++++++++++++
 app/javascripts/routers/router.js             |  93 +++++++++++-----
 .../templates/about_header_view.handlebars    |   5 +
 .../templates/main_header_view.handlebars     |   5 +
 .../terms_of_use_header_view.handlebars       |   5 +
 app/stylesheets/checklist.scss                |   7 ++
 9 files changed, 300 insertions(+), 30 deletions(-)
 create mode 100644 app/javascripts/locales/es.js
 create mode 100644 app/javascripts/locales/fr.js

diff --git a/app/javascripts/app.js b/app/javascripts/app.js
index 4599b48..3684590 100644
--- a/app/javascripts/app.js
+++ b/app/javascripts/app.js
@@ -18,6 +18,8 @@ CLDR = {
 
 require('checklist/vendor/i18n');
 
+Em.I18n.locales = {};
+
 minispade.requireAll(/locales/);
 minispade.requireAll(/templates/);
 
diff --git a/app/javascripts/locales/en.js b/app/javascripts/locales/en.js
index a76ba10..642f9c1 100644
--- a/app/javascripts/locales/en.js
+++ b/app/javascripts/locales/en.js
@@ -1,6 +1,7 @@
-Em.I18n.locales = {};
-
 Em.I18n.locales.en = {
+  'language.en': 'English',
+  'language.es': 'Spanish',
+  'language.fr': 'French',
   'title': 'Checklist of CITES Species',
   'about.title': 'About the CITES Checklist',
   'terms.title': 'Terms of Use',
diff --git a/app/javascripts/locales/es.js b/app/javascripts/locales/es.js
new file mode 100644
index 0000000..6fb833b
--- /dev/null
+++ b/app/javascripts/locales/es.js
@@ -0,0 +1,104 @@
+Em.I18n.locales.es = {
+  'language.en': 'ES English',
+  'language.es': 'ES Spanish',
+  'language.fr': 'ES French',
+  'title': 'ES Checklist of CITES Species',
+  'about.title': 'ES About the CITES Checklist',
+  'terms.title': 'ES Terms of Use',
+  'toplink.about': 'ES About',
+  'toplink.terms': 'ES Terms of Use',
+  'powered.by': 'ES Powered By',
+
+  'search.by_taxon.button': 'SEARCH',
+  'search.by_taxon.placeholder': 'Species, higher taxon, synonym or common name...',
+  'search.by_appendix.all': 'All',
+  'search.by_appendix.appxs': 'Appxs.',
+
+  'search.by_location.placeholder': 'Type to filter countries or regions',
+  'search.by_location.selected': 'Selected Locations',
+  'search.by_location.regions': 'Regions',
+  'search.by_location.countries': 'Countries and territories',
+
+  'search.clear': 'Clear Search',
+  'search.no_results': 'Your search did not match any taxa.',
+  'search.results.page': 'Page',
+
+  'search.result.show_history': 'Show History',
+  'search.result.hide_history': 'Hide History',
+  'distribution.more': 'and {{count}} more.',
+  'distribution.see_all': 'See all...',
+
+  'timeline.party': 'See reservations to CITES listings',
+  'timeline.split': 'NB: this taxon is split-listed. See also timeline(s) for lower taxa.',
+  'timeline.nohistory': 'No history information is available for this taxon.',
+  'timeline.reservations': 'Appendix-{{appendix}} reservations:',
+  'timeline.event.appendix': 'CITES Appendix {{appendix}}',
+  'timeline.event.symbol.amendment': 'A',
+  'timeline.event.symbol.reservation': 'R',
+  'timeline.event.symbol.reservation_withdrawal': 'W',
+  'timeline.event.description.addition': 'APPENDIX',
+  'timeline.event.description.reservation': 'RESERVATION',
+  'timeline.event.description.reservation_withdrawal': 'RESERVATION WITHDRAWAL',
+
+  'advanced.title': 'Advanced Options',
+  'advanced.common_names': 'COMMON NAMES',
+  'advanced.common_names.en': 'ENG',
+  'advanced.common_names.es': 'SPA',
+  'advanced.common_names.fr': 'FRE',
+  'advanced.online_view': 'Online view',
+  'advanced.online_view.alphabetical': 'Alphabetical',
+  'advanced.online_view.taxonomic': 'Taxonomic',
+  'advanced.online_view.appendix': 'Appendix',
+  'advanced.display': 'DISPLAY',
+  'advanced.display.synonyms': 'Synonyms',
+  'advanced.display.author_name': 'Author\'s name',
+  'advanced.display.unfold_history': 'History of listing',
+  'advanced.downloads': 'Downloads',
+  'advanced.downloads.include_intro':  'Include introduction in PDF',
+
+  'downloads.button': 'Download',
+  'downloads.popup.title': 'Download Taxa',
+  'downloads.popup.info': 'Please select the format of your choice',
+
+  'download.button': 'Download',
+  'download.failed': 'Failed.',
+  'download.remove': 'Remove?',
+  'download.spinner': 'Downloading...',
+
+  'saved_search.button': 'SAVE THIS',
+  'saved_search.count.zero': '',
+  'saved_search.count.one': '1 saved search',
+  'saved_search.count.other': '{{count}} saved searches',
+
+  'featured.title': 'Featured',
+  'featured.index': 'Full species list',
+  'featured.history': 'History of listings',
+  'featured.format': 'Format',
+
+  'locations.count.zero': 'All Locations',
+  'locations.count.one': '1 Location',
+  'locations.count.other': '{{count}} Locations',
+
+  'reports.count.zero': '',
+  'reports.count.one': 'Generating 1 report',
+  'reports.count.other': 'Generating {{count}} reports',
+
+  'reports.ready.count.zero': '',
+  'reports.ready.count.one': '1 report ready',
+  'reports.ready.count.other': '{{count}} reports ready',
+
+  'reports.failed.count.zero': '',
+  'reports.failed.count.one': '1 report failed',
+  'reports.failed.count.other': '{{count}} reports failed',
+
+  'reports.failed.description': 'You can restart a download, or remove it from the list.',
+  'reports.generating.description': 'It can take some time, but you can close this window and continue working in other CITES Checklist reports.',
+
+  'reports.ready.title': 'Your Reports',
+  'reports.generating.title': 'Currently Generating Reportings',
+  'reports.latest.title': 'Your report is being generated',
+
+  'splash.p1': 'CITES (the Convention on International Trade in Endangered Species of Wild Fauna and Flora) is an international agreement between governments that aims to ensure that international trade in specimens of wild animals and plants does not threaten their survival.',
+  'splash.p2': 'The Checklist of CITES Species allows the exploration of more than 35,000 species of animals and plants and their degree of protection.',
+  'splash.button': 'Start Exploring'
+};
diff --git a/app/javascripts/locales/fr.js b/app/javascripts/locales/fr.js
new file mode 100644
index 0000000..3a23c14
--- /dev/null
+++ b/app/javascripts/locales/fr.js
@@ -0,0 +1,104 @@
+Em.I18n.locales.es = {
+  'language.en': 'FR English',
+  'language.es': 'FR Spanish',
+  'language.fr': 'FR French',
+  'title': 'FR Checklist of CITES Species',
+  'about.title': 'FR About the CITES Checklist',
+  'terms.title': 'FR Terms of Use',
+  'toplink.about': 'FR About',
+  'toplink.terms': 'FR Terms of Use',
+  'powered.by': 'FR Powered By',
+
+  'search.by_taxon.button': 'SEARCH',
+  'search.by_taxon.placeholder': 'Species, higher taxon, synonym or common name...',
+  'search.by_appendix.all': 'All',
+  'search.by_appendix.appxs': 'Appxs.',
+
+  'search.by_location.placeholder': 'Type to filter countries or regions',
+  'search.by_location.selected': 'Selected Locations',
+  'search.by_location.regions': 'Regions',
+  'search.by_location.countries': 'Countries and territories',
+
+  'search.clear': 'Clear Search',
+  'search.no_results': 'Your search did not match any taxa.',
+  'search.results.page': 'Page',
+
+  'search.result.show_history': 'Show History',
+  'search.result.hide_history': 'Hide History',
+  'distribution.more': 'and {{count}} more.',
+  'distribution.see_all': 'See all...',
+
+  'timeline.party': 'See reservations to CITES listings',
+  'timeline.split': 'NB: this taxon is split-listed. See also timeline(s) for lower taxa.',
+  'timeline.nohistory': 'No history information is available for this taxon.',
+  'timeline.reservations': 'Appendix-{{appendix}} reservations:',
+  'timeline.event.appendix': 'CITES Appendix {{appendix}}',
+  'timeline.event.symbol.amendment': 'A',
+  'timeline.event.symbol.reservation': 'R',
+  'timeline.event.symbol.reservation_withdrawal': 'W',
+  'timeline.event.description.addition': 'APPENDIX',
+  'timeline.event.description.reservation': 'RESERVATION',
+  'timeline.event.description.reservation_withdrawal': 'RESERVATION WITHDRAWAL',
+
+  'advanced.title': 'Advanced Options',
+  'advanced.common_names': 'COMMON NAMES',
+  'advanced.common_names.en': 'ENG',
+  'advanced.common_names.es': 'SPA',
+  'advanced.common_names.fr': 'FRE',
+  'advanced.online_view': 'Online view',
+  'advanced.online_view.alphabetical': 'Alphabetical',
+  'advanced.online_view.taxonomic': 'Taxonomic',
+  'advanced.online_view.appendix': 'Appendix',
+  'advanced.display': 'DISPLAY',
+  'advanced.display.synonyms': 'Synonyms',
+  'advanced.display.author_name': 'Author\'s name',
+  'advanced.display.unfold_history': 'History of listing',
+  'advanced.downloads': 'Downloads',
+  'advanced.downloads.include_intro':  'Include introduction in PDF',
+
+  'downloads.button': 'Download',
+  'downloads.popup.title': 'Download Taxa',
+  'downloads.popup.info': 'Please select the format of your choice',
+
+  'download.button': 'Download',
+  'download.failed': 'Failed.',
+  'download.remove': 'Remove?',
+  'download.spinner': 'Downloading...',
+
+  'saved_search.button': 'SAVE THIS',
+  'saved_search.count.zero': '',
+  'saved_search.count.one': '1 saved search',
+  'saved_search.count.other': '{{count}} saved searches',
+
+  'featured.title': 'Featured',
+  'featured.index': 'Full species list',
+  'featured.history': 'History of listings',
+  'featured.format': 'Format',
+
+  'locations.count.zero': 'All Locations',
+  'locations.count.one': '1 Location',
+  'locations.count.other': '{{count}} Locations',
+
+  'reports.count.zero': '',
+  'reports.count.one': 'Generating 1 report',
+  'reports.count.other': 'Generating {{count}} reports',
+
+  'reports.ready.count.zero': '',
+  'reports.ready.count.one': '1 report ready',
+  'reports.ready.count.other': '{{count}} reports ready',
+
+  'reports.failed.count.zero': '',
+  'reports.failed.count.one': '1 report failed',
+  'reports.failed.count.other': '{{count}} reports failed',
+
+  'reports.failed.description': 'You can restart a download, or remove it from the list.',
+  'reports.generating.description': 'It can take some time, but you can close this window and continue working in other CITES Checklist reports.',
+
+  'reports.ready.title': 'Your Reports',
+  'reports.generating.title': 'Currently Generating Reportings',
+  'reports.latest.title': 'Your report is being generated',
+
+  'splash.p1': 'CITES (the Convention on International Trade in Endangered Species of Wild Fauna and Flora) is an international agreement between governments that aims to ensure that international trade in specimens of wild animals and plants does not threaten their survival.',
+  'splash.p2': 'The Checklist of CITES Species allows the exploration of more than 35,000 species of animals and plants and their degree of protection.',
+  'splash.button': 'Start Exploring'
+};
diff --git a/app/javascripts/routers/router.js b/app/javascripts/routers/router.js
index 1c5cfca..de17476 100644
--- a/app/javascripts/routers/router.js
+++ b/app/javascripts/routers/router.js
@@ -1,54 +1,91 @@
 Checklist.Router = Ember.Router.extend({
   location: Checklist.CONFIG.url_type,
+  enableLogging: true,
 
   root: Ember.Route.extend({
-    home: Ember.Route.extend({
+
+    index: Ember.Route.extend({
       route: '/',
       connectOutlets: function(router, event) {
-        var params = router.get('filtersController').toParams();
-        router.get('taxonConceptController').refresh(params);
-
-        router.get('applicationController').connectOutlet({outletName: 'header', viewClass: Checklist.MainHeaderView});
-        router.get('applicationController').connectOutlet({outletName: 'main', viewClass: Checklist.MainView});
+        router.transitionTo('home.index', {locale: Em.I18n.currentLocale});
       }
     }),
 
-    search: Ember.Route.extend({
-      route: '/search/:params',
+    home: Ember.Route.extend({
+      route: '/:locale',
       connectOutlets: function(router, event) {
-        var params = Checklist.Helpers.deparam(event.params);
+        var locale = event.locale;
+        if (locale !== 'en' && locale !== 'es' && locale !== 'fr'){
+          locale = 'en';
+        }
+        Em.I18n.translations = Em.I18n.locales[locale];
+        Em.I18n.currentLocale = locale;
+        console.log(locale);
+      },
 
-        router.get('filtersController').fromParams(params);
-        router.get('taxonConceptController').refresh(params);
+      index: Ember.Route.extend({
+        route: '/',
+        connectOutlets: function(router, event) {
+          var params = router.get('filtersController').toParams();
+          router.get('taxonConceptController').refresh(params);
 
-        if (event.redraw === undefined || event.redraw) {
           router.get('applicationController').connectOutlet({outletName: 'header', viewClass: Checklist.MainHeaderView});
+          router.get('applicationController').connectOutlet({outletName: 'main', viewClass: Checklist.MainView});
         }
+      }),
 
-        router.get('applicationController').connectOutlet({outletName: 'main', viewClass: Checklist.MainView});
-      }
+      search: Ember.Route.extend({
+        route: '/search/:params',
+        connectOutlets: function(router, event) {
+          console.log(event.locale);
+          var params = Checklist.Helpers.deparam(event.params);
+
+          router.get('filtersController').fromParams(params);
+          router.get('taxonConceptController').refresh(params);
+
+          if (event.redraw === undefined || event.redraw) {
+            router.get('applicationController').connectOutlet({outletName: 'header', viewClass: Checklist.MainHeaderView});
+          }
+
+          router.get('applicationController').connectOutlet({outletName: 'main', viewClass: Checklist.MainView});
+        }
+      }),
+
+      about: Ember.Route.extend({
+        route: '/about',
+        connectOutlets: function(router, event) {
+          router.get('applicationController').connectOutlet({outletName: 'header', viewClass: Checklist.AboutHeaderView});
+          router.get('applicationController').connectOutlet({outletName: 'main', viewClass: Checklist.AboutView});
+        }
+      }),
+
+      termsOfUse: Ember.Route.extend({
+        route: '/terms-of-use',
+        connectOutlets: function(router, event) {
+          router.get('applicationController').connectOutlet({outletName: 'header', viewClass: Checklist.TermsOfUseHeaderView});
+          router.get('applicationController').connectOutlet({outletName: 'main', viewClass: Checklist.TermsOfUseView});
+        }
+      })
     }),
 
     doAbout: function(router, event) {
       router.transitionTo('about');
     },
-    about: Ember.Route.extend({
-      route: '/about',
-      connectOutlets: function(router, event) {
-        router.get('applicationController').connectOutlet({outletName: 'header', viewClass: Checklist.AboutHeaderView});
-        router.get('applicationController').connectOutlet({outletName: 'main', viewClass: Checklist.AboutView});
-      }
-    }),
 
     doTermsOfUse: function(router, event) {
       router.transitionTo('termsOfUse');
     },
-    termsOfUse: Ember.Route.extend({
-      route: '/terms-of-use',
-      connectOutlets: function(router, event) {
-        router.get('applicationController').connectOutlet({outletName: 'header', viewClass: Checklist.TermsOfUseHeaderView});
-        router.get('applicationController').connectOutlet({outletName: 'main', viewClass: Checklist.TermsOfUseView});
-      }
-    })
+
+    doLocaleEN: function(router) {
+      router.transitionTo(router.get('currentPath'), {locale: 'en'});
+    },
+
+    doLocaleES: function(router) {
+      router.transitionTo(router.get('currentPath'), {locale: 'es'});
+    },
+
+    doLocaleFR: function(router) {
+      router.transitionTo(router.get('currentPath'), {locale: 'fr'});
+    }
   })
 });
diff --git a/app/javascripts/templates/about_header_view.handlebars b/app/javascripts/templates/about_header_view.handlebars
index 46f8bb4..dead930 100644
--- a/app/javascripts/templates/about_header_view.handlebars
+++ b/app/javascripts/templates/about_header_view.handlebars
@@ -6,6 +6,11 @@
         <h1 class="logo"><a href="/">{{t title}}</a></h1>
         <a href="#" {{action "doTermsOfUse"}} class="top-links">{{t toplink.terms}}</a>
         <a href="#" {{action "doAbout"}} class="top-links">{{t toplink.about}}</a>
+        <div class="locale-selector top-links">
+          <a href="#" {{action doLocaleEN}}>{{t language.en}}</a>
+          <a href="#" {{action doLocaleES}}>{{t language.es}}</a>
+          <a href="#" {{action doLocaleFR}}>{{t language.fr}}</a>
+        </div>
       </div>
 
       <div class="header-frame">
diff --git a/app/javascripts/templates/main_header_view.handlebars b/app/javascripts/templates/main_header_view.handlebars
index e0b18f4..e55cca5 100644
--- a/app/javascripts/templates/main_header_view.handlebars
+++ b/app/javascripts/templates/main_header_view.handlebars
@@ -6,6 +6,11 @@
         <h1 class="logo"><a href="/">{{t title}}</a></h1>
         <a href="#" {{action "doTermsOfUse"}} class="top-links">{{t toplink.terms}}</a>
         <a href="#" {{action "doAbout"}} class="top-links">{{t toplink.about}}</a>
+        <div class="locale-selector top-links">
+          <a href="#" {{action doLocaleEN}}>{{t language.en}}</a>
+          <a href="#" {{action doLocaleES}}>{{t language.es}}</a>
+          <a href="#" {{action doLocaleFR}}>{{t language.fr}}</a>
+        </div>
       </div>
 
       <div class="header-frame">
diff --git a/app/javascripts/templates/terms_of_use_header_view.handlebars b/app/javascripts/templates/terms_of_use_header_view.handlebars
index 3817adf..491dfd7 100644
--- a/app/javascripts/templates/terms_of_use_header_view.handlebars
+++ b/app/javascripts/templates/terms_of_use_header_view.handlebars
@@ -6,6 +6,11 @@
         <h1 class="logo"><a href="/">{{t title}}</a></h1>
         <a href="#" {{action "doTermsOfUse"}} class="top-links">{{t toplink.terms}}</a>
         <a href="#" {{action "doAbout"}} class="top-links">{{t toplink.about}}</a>
+        <div class="locale-selector top-links">
+          <a href="#" {{action doLocaleEN}}>{{t language.en}}</a>
+          <a href="#" {{action doLocaleES}}>{{t language.es}}</a>
+          <a href="#" {{action doLocaleFR}}>{{t language.fr}}</a>
+        </div>
       </div>
 
       <div class="header-frame">
diff --git a/app/stylesheets/checklist.scss b/app/stylesheets/checklist.scss
index 32eff8f..bee69b5 100644
--- a/app/stylesheets/checklist.scss
+++ b/app/stylesheets/checklist.scss
@@ -128,6 +128,13 @@ a:hover {
     float: right;
   }
 
+  .locale-selector {
+    font-size: 13px;
+    margin-right: 20px;
+    line-height: 15px;
+    vertical-align: baseline;
+  }
+
   .logo{
     float:left;
     margin:0;

From 670bf6fd9d68b8233aa3235302c345bc3dc56af1 Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Wed, 19 Mar 2014 13:23:04 +0000
Subject: [PATCH 17/58] [#65553094] pass locale to backend and reload dynamic
 content

---
 .../controllers/filters_controller.js         | 16 +--------
 .../controllers/taxon_concept_controller.js   |  8 +++--
 app/javascripts/models/country.js             |  6 +---
 app/javascripts/models/region.js              |  2 +-
 .../models/timelines_for_taxon_concept.js     |  2 +-
 app/javascripts/routers/router.js             | 35 +++++++++++++++++--
 .../templates/about_header_view.handlebars    |  2 +-
 .../templates/main_header_view.handlebars     |  2 +-
 .../templates/sorting_radio_button.handlebars | 11 ++----
 .../terms_of_use_header_view.handlebars       |  2 +-
 app/javascripts/views/custom_search.js        | 19 ++++------
 11 files changed, 56 insertions(+), 49 deletions(-)

diff --git a/app/javascripts/controllers/filters_controller.js b/app/javascripts/controllers/filters_controller.js
index c229a39..314c1f7 100644
--- a/app/javascripts/controllers/filters_controller.js
+++ b/app/javascripts/controllers/filters_controller.js
@@ -4,13 +4,10 @@ Checklist.FiltersController = Ember.Object.extend({
    * loading events properly, so we use findQuery with an empty query
    * string.
    */
-  countriesContent : Checklist.store.findQuery(Checklist.Country, {}),
   countries : [],
   countriesIds : [],
-  regionsContent : Checklist.store.findQuery(Checklist.Region, {}),
   regions : [],
   regionsIds: [],
-  appendicesContent : Checklist.store.findQuery(Checklist.Appendix, {}),
   appendices : [],
   appendicesIds : [],
   taxonomicLayout : false,
@@ -72,19 +69,10 @@ Checklist.FiltersController = Ember.Object.extend({
             return that.get('appendicesIds').contains(item.get('abbreviation'));
           }
         )
-    );
+      );
     }
   }.observes('appendicesContent.isLoaded','appendicesIds'),
 
-  localeDidChange: function() {
-    var locale = this.get('locale');
-
-    if (Em.I18n.locales[locale]) {
-      Em.I18n.currentLocale = locale;
-      CLDR.defaultLanguage = locale;
-    }
-  }.observes('locale'),
-
   resetParams: function() {
     this.set('countries',[]);
     this.set('countriesIds',[]);
@@ -162,7 +150,5 @@ Checklist.FiltersController = Ember.Object.extend({
     this.set('scientificName', params.scientific_name || "");
     this.set('page', parseInt(params.page, 10) || 1);
     this.set('perPage', parseInt(params.perPage, 10) || 20);
-
-    this.set('locale', params.locale);
   }
 });
diff --git a/app/javascripts/controllers/taxon_concept_controller.js b/app/javascripts/controllers/taxon_concept_controller.js
index 50b9d37..09dfe14 100644
--- a/app/javascripts/controllers/taxon_concept_controller.js
+++ b/app/javascripts/controllers/taxon_concept_controller.js
@@ -11,10 +11,14 @@ Checklist.TaxonConceptController = Ember.ArrayController.extend({
     if (this.get('content.isLoaded')){
       this.set('taxaCount', this.get('content').objectAt(0).get('total_cnt'));
       this.set('contentHistory',
-        Checklist.store.findMany(Checklist.TimelinesForTaxonConcept, this.get('contentIds'))
+        Checklist.store.find(
+          Checklist.TimelinesForTaxonConcept, {
+            taxon_concept_ids: this.get('contentIds'), locale: Em.I18n.currentLocale
+          }
+        )
       );
     }
-  }.observes('content.isLoaded','contentIds'),
+  }.observes('content.@each.isLoaded','contentIds'),
 
   refresh: function(params) {
     this.set('content', Checklist.store.find(
diff --git a/app/javascripts/models/country.js b/app/javascripts/models/country.js
index 8056b1a..f2cc620 100644
--- a/app/javascripts/models/country.js
+++ b/app/javascripts/models/country.js
@@ -5,9 +5,5 @@ Checklist.Country = DS.Model.extend({
 });
 
 Checklist.Country.reopenClass({
-  // IE10 for some reason aappends a questionmark to this url
-  // consequently, territories would not get fetched for location dropdown
-  // this is an ugly workaround to a problem that seems to be too ember-data
-  // specific
-  collectionUrl: 'geo_entities?geo_entity_types_set=2&1'
+  collectionUrl: 'geo_entities'
 });
diff --git a/app/javascripts/models/region.js b/app/javascripts/models/region.js
index 46a76c4..21128d5 100644
--- a/app/javascripts/models/region.js
+++ b/app/javascripts/models/region.js
@@ -4,5 +4,5 @@ Checklist.Region = DS.Model.extend({
 });
 
 Checklist.Region.reopenClass({
-  collectionUrl: 'geo_entities?geo_entity_types_set=1&1'
+  collectionUrl: 'geo_entities'
 });
diff --git a/app/javascripts/models/timelines_for_taxon_concept.js b/app/javascripts/models/timelines_for_taxon_concept.js
index 7b31516..fc423fb 100644
--- a/app/javascripts/models/timelines_for_taxon_concept.js
+++ b/app/javascripts/models/timelines_for_taxon_concept.js
@@ -8,5 +8,5 @@ Checklist.TimelinesForTaxonConcept = DS.Model.extend({
 });
 
 Checklist.TimelinesForTaxonConcept.reopenClass({
-  url: 'timelines?taxon_concept_ids=%@'
+  collectionUrl: 'timelines'
 });
diff --git a/app/javascripts/routers/router.js b/app/javascripts/routers/router.js
index de17476..b60aa1f 100644
--- a/app/javascripts/routers/router.js
+++ b/app/javascripts/routers/router.js
@@ -20,12 +20,28 @@ Checklist.Router = Ember.Router.extend({
         }
         Em.I18n.translations = Em.I18n.locales[locale];
         Em.I18n.currentLocale = locale;
-        console.log(locale);
+        console.log('CURRENT LOCALE IS:', Em.I18n.currentLocale);
+        router.get('filtersController').set(
+          'appendicesContent',
+          Checklist.store.findQuery(Checklist.Appendix, {})
+        );
       },
 
       index: Ember.Route.extend({
         route: '/',
         connectOutlets: function(router, event) {
+          router.get('filtersController').set(
+            'countriesContent',
+            Checklist.store.findQuery(
+              Checklist.Country, {geo_entity_types_set: 2, locale: Em.I18n.currentLocale}
+            )
+          );
+          router.get('filtersController').set(
+            'regionsContent',
+            Checklist.store.findQuery(
+              Checklist.Country, {geo_entity_types_set: 1, locale: Em.I18n.currentLocale}
+            )
+          );
           var params = router.get('filtersController').toParams();
           router.get('taxonConceptController').refresh(params);
 
@@ -37,7 +53,18 @@ Checklist.Router = Ember.Router.extend({
       search: Ember.Route.extend({
         route: '/search/:params',
         connectOutlets: function(router, event) {
-          console.log(event.locale);
+          router.get('filtersController').set(
+            'countriesContent',
+            Checklist.store.findQuery(
+              Checklist.Country, {geo_entity_types_set: 2, locale: Em.I18n.currentLocale}
+            )
+          );
+          router.get('filtersController').set(
+            'regionsContent',
+            Checklist.store.findQuery(
+              Checklist.Country, {geo_entity_types_set: 1, locale: Em.I18n.currentLocale}
+            )
+          );
           var params = Checklist.Helpers.deparam(event.params);
 
           router.get('filtersController').fromParams(params);
@@ -68,6 +95,10 @@ Checklist.Router = Ember.Router.extend({
       })
     }),
 
+    doHome: function(router, event) {
+      router.transitionTo('index');
+    },
+
     doAbout: function(router, event) {
       router.transitionTo('about');
     },
diff --git a/app/javascripts/templates/about_header_view.handlebars b/app/javascripts/templates/about_header_view.handlebars
index dead930..78cfda1 100644
--- a/app/javascripts/templates/about_header_view.handlebars
+++ b/app/javascripts/templates/about_header_view.handlebars
@@ -3,7 +3,7 @@
     <div class="c1">
 
       <div class="logo-holder">
-        <h1 class="logo"><a href="/">{{t title}}</a></h1>
+        <h1 class="logo"><a href="#" {{action "doHome"}}>{{t title}}</a></h1>
         <a href="#" {{action "doTermsOfUse"}} class="top-links">{{t toplink.terms}}</a>
         <a href="#" {{action "doAbout"}} class="top-links">{{t toplink.about}}</a>
         <div class="locale-selector top-links">
diff --git a/app/javascripts/templates/main_header_view.handlebars b/app/javascripts/templates/main_header_view.handlebars
index e55cca5..d86c369 100644
--- a/app/javascripts/templates/main_header_view.handlebars
+++ b/app/javascripts/templates/main_header_view.handlebars
@@ -3,7 +3,7 @@
     <div class="c1">
 
       <div class="logo-holder">
-        <h1 class="logo"><a href="/">{{t title}}</a></h1>
+        <h1 class="logo"><a href="#" {{action "doHome"}}>{{t title}}</a></h1>
         <a href="#" {{action "doTermsOfUse"}} class="top-links">{{t toplink.terms}}</a>
         <a href="#" {{action "doAbout"}} class="top-links">{{t toplink.about}}</a>
         <div class="locale-selector top-links">
diff --git a/app/javascripts/templates/sorting_radio_button.handlebars b/app/javascripts/templates/sorting_radio_button.handlebars
index 0e5a2f8..f5fe743 100644
--- a/app/javascripts/templates/sorting_radio_button.handlebars
+++ b/app/javascripts/templates/sorting_radio_button.handlebars
@@ -1,8 +1,3 @@
-{{! Inline if helpers in Handlebars are rendered with binding elements
-    so an unpleasant repetition has to be made here. }}
-
-{{#if view.isChecked}}
-  <input type="radio" class="styled" name="{{unbound view.grouping}}" id="{{unbound name}}" checked> <label for="{{unbound name}}">{{unbound name}}</label>
-{{else}}
-  <input type="radio" class="styled" name="{{unbound view.grouping}}" id="{{unbound name}}"> <label for="{{unbound name}}">{{unbound name}}</label>
-{{/if}}
+<input type="radio" name="{{unbound view.grouping}}" id="{{unbound this}}"
+{{bindAttr checked="view.isChecked"}}>
+<label for="{{unbound this}}">{{view.displayName}}</label>
diff --git a/app/javascripts/templates/terms_of_use_header_view.handlebars b/app/javascripts/templates/terms_of_use_header_view.handlebars
index 491dfd7..b79a7a0 100644
--- a/app/javascripts/templates/terms_of_use_header_view.handlebars
+++ b/app/javascripts/templates/terms_of_use_header_view.handlebars
@@ -3,7 +3,7 @@
     <div class="c1">
 
       <div class="logo-holder">
-        <h1 class="logo"><a href="/">{{t title}}</a></h1>
+        <h1 class="logo"><a href="#" {{action "doHome"}}>{{t title}}</a></h1>
         <a href="#" {{action "doTermsOfUse"}} class="top-links">{{t toplink.terms}}</a>
         <a href="#" {{action "doAbout"}} class="top-links">{{t toplink.about}}</a>
         <div class="locale-selector top-links">
diff --git a/app/javascripts/views/custom_search.js b/app/javascripts/views/custom_search.js
index 97910d9..387ea6e 100644
--- a/app/javascripts/views/custom_search.js
+++ b/app/javascripts/views/custom_search.js
@@ -56,16 +56,7 @@ Checklist.SortingRadioButtons = Ember.CollectionView.extend({
 
   grouping: Checklist.Helpers.generateId(),
 
-  content: [{
-    name: Em.I18n.t('advanced.online_view.alphabetical'),
-    value: 'alphabetical'
-  }, {
-    name: Em.I18n.t('advanced.online_view.taxonomic'),
-    value: 'taxonomic'
-  }, {
-    name: Em.I18n.t('advanced.online_view.appendix'),
-    value: 'appendix'
-  }],
+  content: ['alphabetical', 'taxonomic', 'appendix'],
 
   itemViewClass: Ember.View.extend({
     classNames: ['row'],
@@ -80,7 +71,7 @@ Checklist.SortingRadioButtons = Ember.CollectionView.extend({
     isChecked: function() {
       var controller = this.get('controller');
 
-      switch (this.get('context').value) {
+      switch (this.get('context')) {
         case "alphabetical":
           return !controller.get('taxonomicLayout') &&
                  !controller.get('levelOfListing');
@@ -96,11 +87,15 @@ Checklist.SortingRadioButtons = Ember.CollectionView.extend({
       }
     }.property(),
 
+    displayName: function(){
+      return Em.I18n.t('advanced.online_view.' + this.get('context'));
+    }.property('context'),
+
     mouseUp: function(event) {
       var router = Checklist.get('router');
       var controller = this.get('controller');
 
-      switch (this.get('context').value) {
+      switch (this.get('context')) {
         case "alphabetical":
           controller.set('taxonomicLayout', false);
           controller.set('levelOfListing', false);

From a2e38243a14f78024b1effedbce1d39107eaf7a1 Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Wed, 19 Mar 2014 13:24:29 +0000
Subject: [PATCH 18/58] [#65553094] dummy translations

---
 app/javascripts/locales/es.js | 160 +++++++++++++++++-----------------
 app/javascripts/locales/fr.js | 160 +++++++++++++++++-----------------
 2 files changed, 160 insertions(+), 160 deletions(-)

diff --git a/app/javascripts/locales/es.js b/app/javascripts/locales/es.js
index 6fb833b..360ca69 100644
--- a/app/javascripts/locales/es.js
+++ b/app/javascripts/locales/es.js
@@ -9,96 +9,96 @@ Em.I18n.locales.es = {
   'toplink.terms': 'ES Terms of Use',
   'powered.by': 'ES Powered By',
 
-  'search.by_taxon.button': 'SEARCH',
-  'search.by_taxon.placeholder': 'Species, higher taxon, synonym or common name...',
-  'search.by_appendix.all': 'All',
-  'search.by_appendix.appxs': 'Appxs.',
-
-  'search.by_location.placeholder': 'Type to filter countries or regions',
-  'search.by_location.selected': 'Selected Locations',
-  'search.by_location.regions': 'Regions',
-  'search.by_location.countries': 'Countries and territories',
-
-  'search.clear': 'Clear Search',
-  'search.no_results': 'Your search did not match any taxa.',
-  'search.results.page': 'Page',
-
-  'search.result.show_history': 'Show History',
-  'search.result.hide_history': 'Hide History',
-  'distribution.more': 'and {{count}} more.',
-  'distribution.see_all': 'See all...',
-
-  'timeline.party': 'See reservations to CITES listings',
-  'timeline.split': 'NB: this taxon is split-listed. See also timeline(s) for lower taxa.',
-  'timeline.nohistory': 'No history information is available for this taxon.',
-  'timeline.reservations': 'Appendix-{{appendix}} reservations:',
-  'timeline.event.appendix': 'CITES Appendix {{appendix}}',
-  'timeline.event.symbol.amendment': 'A',
-  'timeline.event.symbol.reservation': 'R',
-  'timeline.event.symbol.reservation_withdrawal': 'W',
-  'timeline.event.description.addition': 'APPENDIX',
-  'timeline.event.description.reservation': 'RESERVATION',
-  'timeline.event.description.reservation_withdrawal': 'RESERVATION WITHDRAWAL',
-
-  'advanced.title': 'Advanced Options',
-  'advanced.common_names': 'COMMON NAMES',
-  'advanced.common_names.en': 'ENG',
-  'advanced.common_names.es': 'SPA',
-  'advanced.common_names.fr': 'FRE',
-  'advanced.online_view': 'Online view',
-  'advanced.online_view.alphabetical': 'Alphabetical',
-  'advanced.online_view.taxonomic': 'Taxonomic',
-  'advanced.online_view.appendix': 'Appendix',
-  'advanced.display': 'DISPLAY',
-  'advanced.display.synonyms': 'Synonyms',
-  'advanced.display.author_name': 'Author\'s name',
-  'advanced.display.unfold_history': 'History of listing',
-  'advanced.downloads': 'Downloads',
+  'search.by_taxon.button': 'ES SEARCH',
+  'search.by_taxon.placeholder': 'ES Species, higher taxon, synonym or common name...',
+  'search.by_appendix.all': 'ES All',
+  'search.by_appendix.appxs': 'ES Appxs.',
+
+  'search.by_location.placeholder': 'ES Type to filter countries or regions',
+  'search.by_location.selected': 'ES Selected Locations',
+  'search.by_location.regions': 'ES Regions',
+  'search.by_location.countries': 'ES Countries and territories',
+
+  'search.clear': 'ES Clear Search',
+  'search.no_results': 'ES Your search did not match any taxa.',
+  'search.results.page': 'ES Page',
+
+  'search.result.show_history': 'ES Show History',
+  'search.result.hide_history': 'ES Hide History',
+  'distribution.more': 'ES and {{count}} more.',
+  'distribution.see_all': 'ES See all...',
+
+  'timeline.party': 'ES See reservations to CITES listings',
+  'timeline.split': 'ES NB: this taxon is split-listed. See also timeline(s) for lower taxa.',
+  'timeline.nohistory': 'ES No history information is available for this taxon.',
+  'timeline.reservations': 'ES Appendix-{{appendix}} reservations:',
+  'timeline.event.appendix': 'ES CITES Appendix {{appendix}}',
+  'timeline.event.symbol.amendment': 'ES A',
+  'timeline.event.symbol.reservation': 'ES R',
+  'timeline.event.symbol.reservation_withdrawal': 'ES W',
+  'timeline.event.description.addition': 'ES APPENDIX',
+  'timeline.event.description.reservation': 'ES RESERVATION',
+  'timeline.event.description.reservation_withdrawal': 'ES RESERVATION WITHDRAWAL',
+
+  'advanced.title': 'ES Advanced Options',
+  'advanced.common_names': 'ES COMMON NAMES',
+  'advanced.common_names.en': 'ES ENG',
+  'advanced.common_names.es': 'ES SPA',
+  'advanced.common_names.fr': 'ES FRE',
+  'advanced.online_view': 'ES Online view',
+  'advanced.online_view.alphabetical': 'ES Alphabetical',
+  'advanced.online_view.taxonomic': 'ES Taxonomic',
+  'advanced.online_view.appendix': 'ES Appendix',
+  'advanced.display': 'ES DISPLAY',
+  'advanced.display.synonyms': 'ES Synonyms',
+  'advanced.display.author_name': 'ES Author\'s name',
+  'advanced.display.unfold_history': 'ES History of listing',
+  'advanced.downloads': 'ES Downloads',
   'advanced.downloads.include_intro':  'Include introduction in PDF',
 
-  'downloads.button': 'Download',
-  'downloads.popup.title': 'Download Taxa',
-  'downloads.popup.info': 'Please select the format of your choice',
+  'downloads.button': 'ES Download',
+  'downloads.popup.title': 'ES Download Taxa',
+  'downloads.popup.info': 'ES Please select the format of your choice',
 
-  'download.button': 'Download',
-  'download.failed': 'Failed.',
-  'download.remove': 'Remove?',
-  'download.spinner': 'Downloading...',
+  'download.button': 'ES Download',
+  'download.failed': 'ES Failed.',
+  'download.remove': 'ES Remove?',
+  'download.spinner': 'ES Downloading...',
 
-  'saved_search.button': 'SAVE THIS',
-  'saved_search.count.zero': '',
-  'saved_search.count.one': '1 saved search',
-  'saved_search.count.other': '{{count}} saved searches',
+  'saved_search.button': 'ES SAVE THIS',
+  'saved_search.count.zero': 'ES ',
+  'saved_search.count.one': 'ES 1 saved search',
+  'saved_search.count.other': 'ES {{count}} saved searches',
 
-  'featured.title': 'Featured',
-  'featured.index': 'Full species list',
-  'featured.history': 'History of listings',
-  'featured.format': 'Format',
+  'featured.title': 'ES Featured',
+  'featured.index': 'ES Full species list',
+  'featured.history': 'ES History of listings',
+  'featured.format': 'ES Format',
 
-  'locations.count.zero': 'All Locations',
-  'locations.count.one': '1 Location',
-  'locations.count.other': '{{count}} Locations',
+  'locations.count.zero': 'ES All Locations',
+  'locations.count.one': 'ES 1 Location',
+  'locations.count.other': 'ES {{count}} Locations',
 
-  'reports.count.zero': '',
-  'reports.count.one': 'Generating 1 report',
-  'reports.count.other': 'Generating {{count}} reports',
+  'reports.count.zero': 'ES ',
+  'reports.count.one': 'ES Generating 1 report',
+  'reports.count.other': 'ES Generating {{count}} reports',
 
-  'reports.ready.count.zero': '',
-  'reports.ready.count.one': '1 report ready',
-  'reports.ready.count.other': '{{count}} reports ready',
+  'reports.ready.count.zero': 'ES ',
+  'reports.ready.count.one': 'ES 1 report ready',
+  'reports.ready.count.other': 'ES {{count}} reports ready',
 
-  'reports.failed.count.zero': '',
-  'reports.failed.count.one': '1 report failed',
-  'reports.failed.count.other': '{{count}} reports failed',
+  'reports.failed.count.zero': 'ES ',
+  'reports.failed.count.one': 'ES 1 report failed',
+  'reports.failed.count.other': 'ES {{count}} reports failed',
 
-  'reports.failed.description': 'You can restart a download, or remove it from the list.',
-  'reports.generating.description': 'It can take some time, but you can close this window and continue working in other CITES Checklist reports.',
+  'reports.failed.description': 'ES You can restart a download, or remove it from the list.',
+  'reports.generating.description': 'ES It can take some time, but you can close this window and continue working in other CITES Checklist reports.',
 
-  'reports.ready.title': 'Your Reports',
-  'reports.generating.title': 'Currently Generating Reportings',
-  'reports.latest.title': 'Your report is being generated',
+  'reports.ready.title': 'ES Your Reports',
+  'reports.generating.title': 'ES Currently Generating Reportings',
+  'reports.latest.title': 'ES Your report is being generated',
 
-  'splash.p1': 'CITES (the Convention on International Trade in Endangered Species of Wild Fauna and Flora) is an international agreement between governments that aims to ensure that international trade in specimens of wild animals and plants does not threaten their survival.',
-  'splash.p2': 'The Checklist of CITES Species allows the exploration of more than 35,000 species of animals and plants and their degree of protection.',
-  'splash.button': 'Start Exploring'
+  'splash.p1': 'ES CITES (the Convention on International Trade in Endangered Species of Wild Fauna and Flora) is an international agreement between governments that aims to ensure that international trade in specimens of wild animals and plants does not threaten their survival.',
+  'splash.p2': 'ES The Checklist of CITES Species allows the exploration of more than 35,000 species of animals and plants and their degree of protection.',
+  'splash.button': 'ES Start Exploring'
 };
diff --git a/app/javascripts/locales/fr.js b/app/javascripts/locales/fr.js
index 3a23c14..a33ec70 100644
--- a/app/javascripts/locales/fr.js
+++ b/app/javascripts/locales/fr.js
@@ -9,96 +9,96 @@ Em.I18n.locales.es = {
   'toplink.terms': 'FR Terms of Use',
   'powered.by': 'FR Powered By',
 
-  'search.by_taxon.button': 'SEARCH',
-  'search.by_taxon.placeholder': 'Species, higher taxon, synonym or common name...',
-  'search.by_appendix.all': 'All',
-  'search.by_appendix.appxs': 'Appxs.',
-
-  'search.by_location.placeholder': 'Type to filter countries or regions',
-  'search.by_location.selected': 'Selected Locations',
-  'search.by_location.regions': 'Regions',
-  'search.by_location.countries': 'Countries and territories',
-
-  'search.clear': 'Clear Search',
-  'search.no_results': 'Your search did not match any taxa.',
-  'search.results.page': 'Page',
-
-  'search.result.show_history': 'Show History',
-  'search.result.hide_history': 'Hide History',
-  'distribution.more': 'and {{count}} more.',
-  'distribution.see_all': 'See all...',
-
-  'timeline.party': 'See reservations to CITES listings',
-  'timeline.split': 'NB: this taxon is split-listed. See also timeline(s) for lower taxa.',
-  'timeline.nohistory': 'No history information is available for this taxon.',
-  'timeline.reservations': 'Appendix-{{appendix}} reservations:',
-  'timeline.event.appendix': 'CITES Appendix {{appendix}}',
-  'timeline.event.symbol.amendment': 'A',
-  'timeline.event.symbol.reservation': 'R',
-  'timeline.event.symbol.reservation_withdrawal': 'W',
-  'timeline.event.description.addition': 'APPENDIX',
-  'timeline.event.description.reservation': 'RESERVATION',
-  'timeline.event.description.reservation_withdrawal': 'RESERVATION WITHDRAWAL',
-
-  'advanced.title': 'Advanced Options',
-  'advanced.common_names': 'COMMON NAMES',
-  'advanced.common_names.en': 'ENG',
-  'advanced.common_names.es': 'SPA',
-  'advanced.common_names.fr': 'FRE',
-  'advanced.online_view': 'Online view',
-  'advanced.online_view.alphabetical': 'Alphabetical',
-  'advanced.online_view.taxonomic': 'Taxonomic',
-  'advanced.online_view.appendix': 'Appendix',
-  'advanced.display': 'DISPLAY',
-  'advanced.display.synonyms': 'Synonyms',
-  'advanced.display.author_name': 'Author\'s name',
-  'advanced.display.unfold_history': 'History of listing',
-  'advanced.downloads': 'Downloads',
+  'search.by_taxon.button': 'FR SEARCH',
+  'search.by_taxon.placeholder': 'FR Species, higher taxon, synonym or common name...',
+  'search.by_appendix.all': 'FR All',
+  'search.by_appendix.appxs': 'FR Appxs.',
+
+  'search.by_location.placeholder': 'FR Type to filter countries or regions',
+  'search.by_location.selected': 'FR Selected Locations',
+  'search.by_location.regions': 'FR Regions',
+  'search.by_location.countries': 'FR Countries and territories',
+
+  'search.clear': 'FR Clear Search',
+  'search.no_results': 'FR Your search did not match any taxa.',
+  'search.results.page': 'FR Page',
+
+  'search.result.show_history': 'FR Show History',
+  'search.result.hide_history': 'FR Hide History',
+  'distribution.more': 'FR and {{count}} more.',
+  'distribution.see_all': 'FR See all...',
+
+  'timeline.party': 'FR See reservations to CITES listings',
+  'timeline.split': 'FR NB: this taxon is split-listed. See also timeline(s) for lower taxa.',
+  'timeline.nohistory': 'FR No history information is available for this taxon.',
+  'timeline.reservations': 'FR Appendix-{{appendix}} reservations:',
+  'timeline.event.appendix': 'FR CITES Appendix {{appendix}}',
+  'timeline.event.symbol.amendment': 'FR A',
+  'timeline.event.symbol.reservation': 'FR R',
+  'timeline.event.symbol.reservation_withdrawal': 'FR W',
+  'timeline.event.description.addition': 'FR APPENDIX',
+  'timeline.event.description.reservation': 'FR RESERVATION',
+  'timeline.event.description.reservation_withdrawal': 'FR RESERVATION WITHDRAWAL',
+
+  'advanced.title': 'FR Advanced Options',
+  'advanced.common_names': 'FR COMMON NAMES',
+  'advanced.common_names.en': 'FR ENG',
+  'advanced.common_names.es': 'FR SPA',
+  'advanced.common_names.fr': 'FR FRE',
+  'advanced.online_view': 'FR Online view',
+  'advanced.online_view.alphabetical': 'FR Alphabetical',
+  'advanced.online_view.taxonomic': 'FR Taxonomic',
+  'advanced.online_view.appendix': 'FR Appendix',
+  'advanced.display': 'FR DISPLAY',
+  'advanced.display.synonyms': 'FR Synonyms',
+  'advanced.display.author_name': 'FR Author\'s name',
+  'advanced.display.unfold_history': 'FR History of listing',
+  'advanced.downloads': 'FR Downloads',
   'advanced.downloads.include_intro':  'Include introduction in PDF',
 
-  'downloads.button': 'Download',
-  'downloads.popup.title': 'Download Taxa',
-  'downloads.popup.info': 'Please select the format of your choice',
+  'downloads.button': 'FR Download',
+  'downloads.popup.title': 'FR Download Taxa',
+  'downloads.popup.info': 'FR Please select the format of your choice',
 
-  'download.button': 'Download',
-  'download.failed': 'Failed.',
-  'download.remove': 'Remove?',
-  'download.spinner': 'Downloading...',
+  'download.button': 'FR Download',
+  'download.failed': 'FR Failed.',
+  'download.remove': 'FR Remove?',
+  'download.spinner': 'FR Downloading...',
 
-  'saved_search.button': 'SAVE THIS',
-  'saved_search.count.zero': '',
-  'saved_search.count.one': '1 saved search',
-  'saved_search.count.other': '{{count}} saved searches',
+  'saved_search.button': 'FR SAVE THIS',
+  'saved_search.count.zero': 'FR ',
+  'saved_search.count.one': 'FR 1 saved search',
+  'saved_search.count.other': 'FR {{count}} saved searches',
 
-  'featured.title': 'Featured',
-  'featured.index': 'Full species list',
-  'featured.history': 'History of listings',
-  'featured.format': 'Format',
+  'featured.title': 'FR Featured',
+  'featured.index': 'FR Full species list',
+  'featured.history': 'FR History of listings',
+  'featured.format': 'FR Format',
 
-  'locations.count.zero': 'All Locations',
-  'locations.count.one': '1 Location',
-  'locations.count.other': '{{count}} Locations',
+  'locations.count.zero': 'FR All Locations',
+  'locations.count.one': 'FR 1 Location',
+  'locations.count.other': 'FR {{count}} Locations',
 
-  'reports.count.zero': '',
-  'reports.count.one': 'Generating 1 report',
-  'reports.count.other': 'Generating {{count}} reports',
+  'reports.count.zero': 'FR ',
+  'reports.count.one': 'FR Generating 1 report',
+  'reports.count.other': 'FR Generating {{count}} reports',
 
-  'reports.ready.count.zero': '',
-  'reports.ready.count.one': '1 report ready',
-  'reports.ready.count.other': '{{count}} reports ready',
+  'reports.ready.count.zero': 'FR ',
+  'reports.ready.count.one': 'FR 1 report ready',
+  'reports.ready.count.other': 'FR {{count}} reports ready',
 
-  'reports.failed.count.zero': '',
-  'reports.failed.count.one': '1 report failed',
-  'reports.failed.count.other': '{{count}} reports failed',
+  'reports.failed.count.zero': 'FR ',
+  'reports.failed.count.one': 'FR 1 report failed',
+  'reports.failed.count.other': 'FR {{count}} reports failed',
 
-  'reports.failed.description': 'You can restart a download, or remove it from the list.',
-  'reports.generating.description': 'It can take some time, but you can close this window and continue working in other CITES Checklist reports.',
+  'reports.failed.description': 'FR You can restart a download, or remove it from the list.',
+  'reports.generating.description': 'FR It can take some time, but you can close this window and continue working in other CITES Checklist reports.',
 
-  'reports.ready.title': 'Your Reports',
-  'reports.generating.title': 'Currently Generating Reportings',
-  'reports.latest.title': 'Your report is being generated',
+  'reports.ready.title': 'FR Your Reports',
+  'reports.generating.title': 'FR Currently Generating Reportings',
+  'reports.latest.title': 'FR Your report is being generated',
 
-  'splash.p1': 'CITES (the Convention on International Trade in Endangered Species of Wild Fauna and Flora) is an international agreement between governments that aims to ensure that international trade in specimens of wild animals and plants does not threaten their survival.',
-  'splash.p2': 'The Checklist of CITES Species allows the exploration of more than 35,000 species of animals and plants and their degree of protection.',
-  'splash.button': 'Start Exploring'
+  'splash.p1': 'FR CITES (the Convention on International Trade in Endangered Species of Wild Fauna and Flora) is an international agreement between governments that aims to ensure that international trade in specimens of wild animals and plants does not threaten their survival.',
+  'splash.p2': 'FR The Checklist of CITES Species allows the exploration of more than 35,000 species of animals and plants and their degree of protection.',
+  'splash.button': 'FR Start Exploring'
 };

From f876e0dd75f88f929114bbf32258c62a3e9f492c Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Wed, 19 Mar 2014 13:32:55 +0000
Subject: [PATCH 19/58] [#65553094] fixed the locale switching links text

---
 app/javascripts/locales/en.js                               | 3 ---
 app/javascripts/locales/es.js                               | 3 ---
 app/javascripts/locales/fr.js                               | 5 +----
 app/javascripts/templates/about_header_view.handlebars      | 6 +++---
 app/javascripts/templates/main_header_view.handlebars       | 6 +++---
 .../templates/terms_of_use_header_view.handlebars           | 6 +++---
 6 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/app/javascripts/locales/en.js b/app/javascripts/locales/en.js
index 642f9c1..0cf68e2 100644
--- a/app/javascripts/locales/en.js
+++ b/app/javascripts/locales/en.js
@@ -1,7 +1,4 @@
 Em.I18n.locales.en = {
-  'language.en': 'English',
-  'language.es': 'Spanish',
-  'language.fr': 'French',
   'title': 'Checklist of CITES Species',
   'about.title': 'About the CITES Checklist',
   'terms.title': 'Terms of Use',
diff --git a/app/javascripts/locales/es.js b/app/javascripts/locales/es.js
index 360ca69..cb8144a 100644
--- a/app/javascripts/locales/es.js
+++ b/app/javascripts/locales/es.js
@@ -1,7 +1,4 @@
 Em.I18n.locales.es = {
-  'language.en': 'ES English',
-  'language.es': 'ES Spanish',
-  'language.fr': 'ES French',
   'title': 'ES Checklist of CITES Species',
   'about.title': 'ES About the CITES Checklist',
   'terms.title': 'ES Terms of Use',
diff --git a/app/javascripts/locales/fr.js b/app/javascripts/locales/fr.js
index a33ec70..e5f9200 100644
--- a/app/javascripts/locales/fr.js
+++ b/app/javascripts/locales/fr.js
@@ -1,7 +1,4 @@
-Em.I18n.locales.es = {
-  'language.en': 'FR English',
-  'language.es': 'FR Spanish',
-  'language.fr': 'FR French',
+Em.I18n.locales.fr = {
   'title': 'FR Checklist of CITES Species',
   'about.title': 'FR About the CITES Checklist',
   'terms.title': 'FR Terms of Use',
diff --git a/app/javascripts/templates/about_header_view.handlebars b/app/javascripts/templates/about_header_view.handlebars
index 78cfda1..fa49804 100644
--- a/app/javascripts/templates/about_header_view.handlebars
+++ b/app/javascripts/templates/about_header_view.handlebars
@@ -7,9 +7,9 @@
         <a href="#" {{action "doTermsOfUse"}} class="top-links">{{t toplink.terms}}</a>
         <a href="#" {{action "doAbout"}} class="top-links">{{t toplink.about}}</a>
         <div class="locale-selector top-links">
-          <a href="#" {{action doLocaleEN}}>{{t language.en}}</a>
-          <a href="#" {{action doLocaleES}}>{{t language.es}}</a>
-          <a href="#" {{action doLocaleFR}}>{{t language.fr}}</a>
+          <a href="#" {{action doLocaleEN}}>English</a>
+          <a href="#" {{action doLocaleES}}>Español</a>
+          <a href="#" {{action doLocaleFR}}>Français</a>
         </div>
       </div>
 
diff --git a/app/javascripts/templates/main_header_view.handlebars b/app/javascripts/templates/main_header_view.handlebars
index d86c369..3ade3e5 100644
--- a/app/javascripts/templates/main_header_view.handlebars
+++ b/app/javascripts/templates/main_header_view.handlebars
@@ -7,9 +7,9 @@
         <a href="#" {{action "doTermsOfUse"}} class="top-links">{{t toplink.terms}}</a>
         <a href="#" {{action "doAbout"}} class="top-links">{{t toplink.about}}</a>
         <div class="locale-selector top-links">
-          <a href="#" {{action doLocaleEN}}>{{t language.en}}</a>
-          <a href="#" {{action doLocaleES}}>{{t language.es}}</a>
-          <a href="#" {{action doLocaleFR}}>{{t language.fr}}</a>
+          <a href="#" {{action doLocaleEN}}>English</a>
+          <a href="#" {{action doLocaleES}}>Español</a>
+          <a href="#" {{action doLocaleFR}}>Français</a>
         </div>
       </div>
 
diff --git a/app/javascripts/templates/terms_of_use_header_view.handlebars b/app/javascripts/templates/terms_of_use_header_view.handlebars
index b79a7a0..f9fe91f 100644
--- a/app/javascripts/templates/terms_of_use_header_view.handlebars
+++ b/app/javascripts/templates/terms_of_use_header_view.handlebars
@@ -7,9 +7,9 @@
         <a href="#" {{action "doTermsOfUse"}} class="top-links">{{t toplink.terms}}</a>
         <a href="#" {{action "doAbout"}} class="top-links">{{t toplink.about}}</a>
         <div class="locale-selector top-links">
-          <a href="#" {{action doLocaleEN}}>{{t language.en}}</a>
-          <a href="#" {{action doLocaleES}}>{{t language.es}}</a>
-          <a href="#" {{action doLocaleFR}}>{{t language.fr}}</a>
+          <a href="#" {{action doLocaleEN}}>English</a>
+          <a href="#" {{action doLocaleES}}>Español</a>
+          <a href="#" {{action doLocaleFR}}>Français</a>
         </div>
       </div>
 

From 21c1e6b4958c71e2530535e2a239f8371328e1ce Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Fri, 21 Mar 2014 08:02:07 +0000
Subject: [PATCH 20/58] [#65553094] pass locale to custom downloads

---
 app/javascripts/views/download_view.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/javascripts/views/download_view.js b/app/javascripts/views/download_view.js
index 87aff52..c023bdb 100644
--- a/app/javascripts/views/download_view.js
+++ b/app/javascripts/views/download_view.js
@@ -41,7 +41,8 @@ Checklist.DownloadView = Em.View.extend({
           doc_type: doc_type.toLowerCase(),
           format: format.toLowerCase()
         },
-        intro: $('#include-intro').is(':checked')
+        intro: $('#include-intro').is(':checked'),
+        locale: Em.I18n.currentLocale
       }, params)
     );
   },

From 7f2033cf595b61cf44fd67bfbbcab9071e339692 Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Thu, 20 Mar 2014 09:51:57 +0000
Subject: [PATCH 21/58] [#37746913] another attempt at fixing this amazing bug

---
 app/javascripts/models/locations_loader.js | 14 +++++
 app/javascripts/routers/router.js          | 73 +++++++++++-----------
 2 files changed, 50 insertions(+), 37 deletions(-)
 create mode 100644 app/javascripts/models/locations_loader.js

diff --git a/app/javascripts/models/locations_loader.js b/app/javascripts/models/locations_loader.js
new file mode 100644
index 0000000..2db8f52
--- /dev/null
+++ b/app/javascripts/models/locations_loader.js
@@ -0,0 +1,14 @@
+Checklist.LocationsLoader = {
+  load: function(){
+    var promise = new RSVP.Promise();
+    promise.resolve({
+      countries: Checklist.store.findQuery(
+        Checklist.Country, {geo_entity_types_set: 2, locale: Em.I18n.currentLocale}
+      ),
+      regions: Checklist.store.findQuery(
+        Checklist.Country, {geo_entity_types_set: 1, locale: Em.I18n.currentLocale}
+      )
+    });
+    return promise;
+  }
+}
\ No newline at end of file
diff --git a/app/javascripts/routers/router.js b/app/javascripts/routers/router.js
index b60aa1f..fd0771f 100644
--- a/app/javascripts/routers/router.js
+++ b/app/javascripts/routers/router.js
@@ -30,51 +30,50 @@ Checklist.Router = Ember.Router.extend({
       index: Ember.Route.extend({
         route: '/',
         connectOutlets: function(router, event) {
-          router.get('filtersController').set(
-            'countriesContent',
-            Checklist.store.findQuery(
-              Checklist.Country, {geo_entity_types_set: 2, locale: Em.I18n.currentLocale}
-            )
+          Checklist.LocationsLoader.load().then(
+            function(locations){
+              router.get('filtersController').set(
+                'countriesContent', locations.countries
+              );
+              router.get('filtersController').set(
+                'regionsContent', locations.regions
+              );
+              var params = router.get('filtersController').toParams();
+              router.get('taxonConceptController').refresh(params);
+
+              router.get('applicationController').connectOutlet({outletName: 'header', viewClass: Checklist.MainHeaderView});
+              router.get('applicationController').connectOutlet({outletName: 'main', viewClass: Checklist.MainView});
+            }, function(error){
+              console.log(error);
+            }
           );
-          router.get('filtersController').set(
-            'regionsContent',
-            Checklist.store.findQuery(
-              Checklist.Country, {geo_entity_types_set: 1, locale: Em.I18n.currentLocale}
-            )
-          );
-          var params = router.get('filtersController').toParams();
-          router.get('taxonConceptController').refresh(params);
-
-          router.get('applicationController').connectOutlet({outletName: 'header', viewClass: Checklist.MainHeaderView});
-          router.get('applicationController').connectOutlet({outletName: 'main', viewClass: Checklist.MainView});
         }
       }),
 
       search: Ember.Route.extend({
         route: '/search/:params',
         connectOutlets: function(router, event) {
-          router.get('filtersController').set(
-            'countriesContent',
-            Checklist.store.findQuery(
-              Checklist.Country, {geo_entity_types_set: 2, locale: Em.I18n.currentLocale}
-            )
-          );
-          router.get('filtersController').set(
-            'regionsContent',
-            Checklist.store.findQuery(
-              Checklist.Country, {geo_entity_types_set: 1, locale: Em.I18n.currentLocale}
-            )
+          Checklist.LocationsLoader.load().then(
+            function(locations){
+              router.get('filtersController').set(
+                'countriesContent', locations.countries
+              );
+              router.get('filtersController').set(
+                'regionsContent', locations.regions
+              );
+              var params = Checklist.Helpers.deparam(event.params);
+
+              router.get('filtersController').fromParams(params);
+              router.get('taxonConceptController').refresh(params);
+
+              if (event.redraw === undefined || event.redraw) {
+                router.get('applicationController').connectOutlet({outletName: 'header', viewClass: Checklist.MainHeaderView});
+              }
+              router.get('applicationController').connectOutlet({outletName: 'main', viewClass: Checklist.MainView});
+            }, function(error){
+              console.log(error);
+            }
           );
-          var params = Checklist.Helpers.deparam(event.params);
-
-          router.get('filtersController').fromParams(params);
-          router.get('taxonConceptController').refresh(params);
-
-          if (event.redraw === undefined || event.redraw) {
-            router.get('applicationController').connectOutlet({outletName: 'header', viewClass: Checklist.MainHeaderView});
-          }
-
-          router.get('applicationController').connectOutlet({outletName: 'main', viewClass: Checklist.MainView});
         }
       }),
 

From 5e31d131c1b3a1558666954d130867046f160a6c Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Thu, 20 Mar 2014 10:05:29 +0000
Subject: [PATCH 22/58] removed the appendix model and replaced previusly
 loaded appendices with a plain object array

---
 app/javascripts/controllers/filters_controller.js | 10 +++++-----
 app/javascripts/models/appendix.js                |  9 ---------
 app/javascripts/routers/router.js                 |  4 ----
 3 files changed, 5 insertions(+), 18 deletions(-)
 delete mode 100644 app/javascripts/models/appendix.js

diff --git a/app/javascripts/controllers/filters_controller.js b/app/javascripts/controllers/filters_controller.js
index 314c1f7..32d0c17 100644
--- a/app/javascripts/controllers/filters_controller.js
+++ b/app/javascripts/controllers/filters_controller.js
@@ -1,15 +1,15 @@
 Checklist.FiltersController = Ember.Object.extend({
-  /*
-   * In the current version of Ember (0.9.8.1) findAll does not fire
-   * loading events properly, so we use findQuery with an empty query
-   * string.
-   */
   countries : [],
   countriesIds : [],
   regions : [],
   regionsIds: [],
   appendices : [],
   appendicesIds : [],
+  appendicesContent: [
+    Ember.Object.create({abbreviation: 'I'}),
+    Ember.Object.create({abbreviation: 'II'}),
+    Ember.Object.create({abbreviation: 'III'})
+  ],
   taxonomicLayout : false,
   levelOfListing : false,
   showSynonyms : true,
diff --git a/app/javascripts/models/appendix.js b/app/javascripts/models/appendix.js
deleted file mode 100644
index 0e5139b..0000000
--- a/app/javascripts/models/appendix.js
+++ /dev/null
@@ -1,9 +0,0 @@
-Checklist.Appendix = DS.Model.extend({
-  id: DS.attr('number'),
-  abbreviation: DS.attr('string'),
-  name: DS.attr('string')
-});
-
-Checklist.Appendix.reopenClass({
-  collectionUrl: 'species_listings?designation=cites'
-});
diff --git a/app/javascripts/routers/router.js b/app/javascripts/routers/router.js
index fd0771f..499dd2b 100644
--- a/app/javascripts/routers/router.js
+++ b/app/javascripts/routers/router.js
@@ -21,10 +21,6 @@ Checklist.Router = Ember.Router.extend({
         Em.I18n.translations = Em.I18n.locales[locale];
         Em.I18n.currentLocale = locale;
         console.log('CURRENT LOCALE IS:', Em.I18n.currentLocale);
-        router.get('filtersController').set(
-          'appendicesContent',
-          Checklist.store.findQuery(Checklist.Appendix, {})
-        );
       },
 
       index: Ember.Route.extend({

From 32add557f8a7617a30a8fd9b24d2ce8e563d270e Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Thu, 20 Mar 2014 09:18:21 +0000
Subject: [PATCH 23/58] [#65555794] load translated static pages asynchronously

---
 app/javascripts/app.js                        |   1 +
 app/javascripts/routers/router.js             |  20 ++-
 app/javascripts/static_page.js                |  22 +++
 .../about_page_en.html}                       |   0
 app/static/about_page_es.html                 | 160 ++++++++++++++++++
 app/static/about_page_fr.html                 | 160 ++++++++++++++++++
 .../terms_of_use_page_en.html}                |   0
 app/static/terms_of_use_page_es.html          |  57 +++++++
 app/static/terms_of_use_page_fr.html          |  57 +++++++
 9 files changed, 472 insertions(+), 5 deletions(-)
 create mode 100644 app/javascripts/static_page.js
 rename app/{javascripts/templates/about_page.handlebars => static/about_page_en.html} (100%)
 create mode 100644 app/static/about_page_es.html
 create mode 100644 app/static/about_page_fr.html
 rename app/{javascripts/templates/terms_of_use_page.handlebars => static/terms_of_use_page_en.html} (100%)
 create mode 100644 app/static/terms_of_use_page_es.html
 create mode 100644 app/static/terms_of_use_page_fr.html

diff --git a/app/javascripts/app.js b/app/javascripts/app.js
index 3684590..7b308fa 100644
--- a/app/javascripts/app.js
+++ b/app/javascripts/app.js
@@ -69,6 +69,7 @@ Checklist.download_store = DS.Store.create({
   })
 });
 
+require('checklist/static_page');
 require('checklist/routers/router');
 
 Checklist.initialize();
diff --git a/app/javascripts/routers/router.js b/app/javascripts/routers/router.js
index 499dd2b..e9019d5 100644
--- a/app/javascripts/routers/router.js
+++ b/app/javascripts/routers/router.js
@@ -1,6 +1,6 @@
 Checklist.Router = Ember.Router.extend({
   location: Checklist.CONFIG.url_type,
-  enableLogging: true,
+  //enableLogging: true,
 
   root: Ember.Route.extend({
 
@@ -76,16 +76,26 @@ Checklist.Router = Ember.Router.extend({
       about: Ember.Route.extend({
         route: '/about',
         connectOutlets: function(router, event) {
-          router.get('applicationController').connectOutlet({outletName: 'header', viewClass: Checklist.AboutHeaderView});
-          router.get('applicationController').connectOutlet({outletName: 'main', viewClass: Checklist.AboutView});
+          Checklist.StaticPage.getCompiledTemplate('about_page').then(function(template) {
+            router.get('applicationController').connectOutlet({outletName: 'header', viewClass: Checklist.AboutHeaderView});
+            router.get('applicationController').connectOutlet({outletName: 'main', viewClass: Checklist.AboutView});
+          }, function(error) {
+            console.log(error);
+            router.transitionTo('index');
+          });
         }
       }),
 
       termsOfUse: Ember.Route.extend({
         route: '/terms-of-use',
         connectOutlets: function(router, event) {
-          router.get('applicationController').connectOutlet({outletName: 'header', viewClass: Checklist.TermsOfUseHeaderView});
-          router.get('applicationController').connectOutlet({outletName: 'main', viewClass: Checklist.TermsOfUseView});
+          Checklist.StaticPage.getCompiledTemplate('terms_of_use_page').then(function(template) {
+            router.get('applicationController').connectOutlet({outletName: 'header', viewClass: Checklist.TermsOfUseHeaderView});
+            router.get('applicationController').connectOutlet({outletName: 'main', viewClass: Checklist.TermsOfUseView});
+          }, function(error) {
+            console.log(error);
+            router.transitionTo('index');
+          });
         }
       })
     }),
diff --git a/app/javascripts/static_page.js b/app/javascripts/static_page.js
new file mode 100644
index 0000000..8c6fb9b
--- /dev/null
+++ b/app/javascripts/static_page.js
@@ -0,0 +1,22 @@
+Checklist.StaticPage = {
+  getCompiledTemplate: function(templateName){
+    var promise = new RSVP.Promise();
+    var template = templateName + '_' + Em.I18n.currentLocale;
+    var compiledTemplate = Ember.TEMPLATES[template];
+    if (compiledTemplate === undefined){
+      $.ajax({
+        url: '/' + template + '.html',
+        dataType: 'html',
+        success: function(data){
+          compiledTemplate = Ember.Handlebars.compile(data);
+          Ember.TEMPLATES[templateName] = compiledTemplate;
+          promise.resolve(template);
+        },
+        error: function(xhr, msg){
+          promise.reject(msg);
+        }
+      });
+    }
+    return promise;
+  }
+}
diff --git a/app/javascripts/templates/about_page.handlebars b/app/static/about_page_en.html
similarity index 100%
rename from app/javascripts/templates/about_page.handlebars
rename to app/static/about_page_en.html
diff --git a/app/static/about_page_es.html b/app/static/about_page_es.html
new file mode 100644
index 0000000..6f67e54
--- /dev/null
+++ b/app/static/about_page_es.html
@@ -0,0 +1,160 @@
+<div class="wrap">
+  <div class="content">
+    <div class="c1">
+      <div class="content-left">
+        <h2><a id="cites-checklist">ES CITES Checklist</a></h2>
+        <p>
+        The <span class="bold">Checklist of CITES Species</span> provides the official list of CITES-listed species (scientific names)
+        and their associated scientific synonyms; common names in English, French and Spanish (where available) and the CITES Appendix
+        in which they are currently listed (see <a href="http://www.cites.org/eng/res/12/12-11R16.php">Resolution 12.11 (Rev CoP16)</a>).
+        Information on historical Appendix listings, reservations and level of listing (e.g. if a whole family or order is listed)
+        is also available through this website.
+        </p>
+
+        <h2><a id="web-display">Web display &#38; data downloads</a></h2>
+        <p>
+        Users can search for and view CITES listing information for CITES-listed species online. The scientific name, higher taxonomy,
+        scientific synonyms, common names, distribution, current listing and history of listings (in the form of timelines) are all visible
+        through the web display. Filters applied to the search and the Advanced options (see below) also affect the data displayed online.
+        </p>
+        <p>
+          Two distinct outputs are available for download through this website:
+        </p>
+        <ol>
+          <li><span class="bold italic">Index of CITES species:</span> an alphabetical list of all animal and plant taxa currently included in
+            the CITES Appendices; and </li>
+            <li><span class="bold italic">History of CITES listings:</span> a historical record of all CITES listings since 1975, including all
+            reservations and annotations ever made.</li>
+        </ol>
+        <p>
+          Both outputs are available in three different formats: PDF, csv (for use in Excel) and JSON format (for use by web developers).
+        </p>
+        <p><span class="bold">Note on csv files:</span> For the first time, users can now download the official list of CITES-listed species in
+        Excel-ready csv files. The csv files downloadable through this site use commas as separators;
+        this might conflict the regional settings of some computer systems.</p>
+
+        <p>
+          The full <span class="italic">Index of CITES species</span> and <span class="italic">History of CITES listings</span> are always available
+          on the right hand side of the website under <b>&#8220;Featured&#8221; </b>. In the   case of the <span class="italic">Index of CITES species</span>,
+          the full version of this can also be downloaded through the red &#8220;Download&#8221; button if no filters are selected.
+          In addition users also have the flexibility to produce tailored versions of the <span class="italic">Index of
+          CITES species</span> outputs depending on their needs. Most notably, users can filter by name (including higher taxa), CITES Appendix and
+          country/territory/region of occurrence (&#8220;All locations&#8221;).
+          These filters will then filter the data displayed on the website, as well as the data downloaded through the red &#8220;Download&#8221; button,
+          so that users can view and download smaller subsets of data.
+        </p> 
+        <p>
+        <span class="bold">Note</span>: Filters for country/territory/region of occurrence include all taxa associated with that geographic entity, including
+        taxa that are recorded as extinct, introduced or re-introduced in that area. Filters do not apply to the <span class="italic">History of CITES listings</span>
+        outputs, which are only available in full through the &#8220;History of listing&#8221; link under <b>&#8220;Featured&#8221; </b>.
+        </p>
+        <h3 class="bold">Browser compatibility</h3>
+        <p>This site is optimised for Internet Explorer 8, 9 and 10, Firefox, Safari and Google Chrome.
+          The site may not display properly in older browsers.</p>
+
+        <h2><a id="advanced-options">Advanced options:</a></h2>
+        <p>
+          Under &#8220;Advanced options&#8221; users are able to tailor the web display and Checklist outputs as follows:
+        </p>
+        <ul>
+          <li>
+          <span class="bold">Common names:</span> By de-selecting &#8216;ENG&#8217;, &#8216;SPA&#8217;, and &#8216;FRE&#8217;, this will remove the English, Spanish and
+          French common names on both the web display and within the Index downloads accessible through the red &#8220;Download&#8221; button;
+          </li>
+          <li>
+            <span class="bold">Online view:</span> Selecting &#8220;Alphabetical&#8221; or &#8216;Taxonomic&#8217; affects the way the taxonomic entities are sorted on the
+            web view only. The PDF and csv outputs will always be   sorted alphabetically. &#8220;Appendix&#8221; view, when selected, mirrors the display of the CITES Appendices,
+            showing taxa at the level at which they are listed in taxonomic   order. For instance, &#8220;Felidae spp.&#8221; will be included because there is a family
+            listing that applies, but species within Felidae that are included in the family level listing would not appear in the web display. NB: species included within
+            a higher level listing would not be searchable if this format is selected. 
+          </li>
+          <li>
+          <span class="bold">Display:</span> These options affect the information displayed for each taxon on the website.
+          </li>
+          
+            <ul>
+              <li> 
+                <span class="bold">Synonyms:</span> When ticked, scientific synonyms (where available) will be shown in the web display (and within the PDF and csv outputs for the
+                <span class="italic">Index of CITES species</span>). Unticking this will remove the synonyms from the web display and the tailored downloads.
+              </li>
+              <li>
+                <span class="bold">Author&#8217;s name:</span> When ticked, the author citations for taxa will be shown in the web display (and within the PDF and csv outputs).
+                Unticking this will remove the author citation from the web display and the tailored downloads.
+              </li>
+              <li>
+                <span class="bold">History of listing:</span> When ticked, the history of listing (displayed online as a timeline) will expand for all taxa on the page.
+                This does not impact the downloads.
+              </li>
+            </ul>
+          
+        </ul>
+        <h2><a id="timelines">Timelines:</a></h2>
+        <p>
+          Timelines provide a visual display of the history of CITES listings on the web display. Symbols on the timelines indicate the inclusion of a taxon in an
+          Appendix (&#8216;+&#8217;), the removal/deletion of a taxa from an Appendix (&#8216;-&#8217;), and a change to an annotation relevant to the Appendix listing
+          (&#8216;A&#8217;). For timelines displaying reservation information, &#8216;R&#8217; indicates a reservation that was entered by a Party and &#8220;W&#8221;
+          indicates that the Party has withdrawn the reservation. The exact date of the event can be viewed by hovering over the symbols; more details on the listings,
+          reservations or any changes to annotations can be viewed by clicking on the symbols associated with the timeline event. The Appendix symbol representing the
+          current listing (displayed to the right of the scientific name) is also clickable to view additional listing information or annotations that may apply.
+        </p>
+
+        <h2><a id="standard-nomenclature">Standard nomenclatural references used</a></h2>
+        <p>Taxonomic names that have been officially adopted by the Conference of the Parties [see the list of standard nomenclatural references in
+          <a href="http://www.cites.org/eng/res/12/12-11R16.php">Resolution Conf. 12.11 (Rev. CoP16)]</a> appear in boldface in the <span class="italic">Checklist</span>,
+          e.g. <span class="bold italic">Acinonyx jubatus</span> (the cheetah). This is the case for most taxa. In some cases, nevertheless, a standard nomenclatural reference
+          for the constituent species of a higher taxon has not yet been adopted. In such instances, a reference identified by UNEP-WCMC has been used. The names of these taxa
+          are not in boldface, e.g. <span class="italic">Tridacna maxima</span> (or any Tridacnidae species), as in previous printed versions of the <span class="italic">Checklist</span>.
+        </p>
+
+        <h2><a id="contributors">CITES Checklist contributors</a></h2>
+        <p>The CITES Checklist was developed by UNEP-WCMC on behalf of the CITES Secretariat.
+          Financial support to maintain this database has come from a range of sources, on a project 
+          or longer-term basis. Current funders, supporting portions of the maintenance of the underlying data include:
+          WCMC (UK), the European Union and the CITES Secretariat.</p>
+        <p>
+          This information resource is a result of long-term collaboration between countless individual scientists worldwide 
+          and many organizations whose contribution is gratefully acknowledged.
+        </p>
+
+
+        <h2><a id="contact">Contact</a></h2>
+        <div class="contacts">
+        <div class="left">
+          <span class="bold">CITES Secretariat</span><br>
+          International Environment House<br>
+          15, Chemin des Anémones<br>
+          CH 1219 Châtelaine (Geneva)<br>
+          Switzerland<br>
+          Tel: + 41 (0) 22 917 81 39/40<br>
+          Email: <a href="mailto:info@cites.org">info@cites.org</a><br>
+          Website: <a href="http://www.cites.org">www.cites.org</a><br>
+        </div>
+        <div class="right">
+          <span class="bold">UNEP World Conservation Monitoring Centre</span><br>
+          219 Huntingdon Road<br>
+          Cambridge<br>
+          CB3 0DL<br>
+          United Kingdom<br>
+          Tel: +44 (0) 1223 277314<br>
+          Email: <a href="mailto:species@unep-wcmc.org" target="_top">species@unep-wcmc.org</a><br>
+          Website: <a href="http://www.unep-wcmc.org">www.unep-wcmc.org</a><br>
+        </div>
+        </div>
+      </div>
+      <div class="menu-right">
+        <ul>
+          <li><a href="#cites-checklist" class="scroll-to">CITES Checklist</a></li>
+          <li><a href="#web-display" class="scroll-to">Web display &#38; data downloads</a></li>
+          <li><a href="#advanced-options" class="scroll-to">Advanced options</a></li>
+          <li><a href="#timelines" class="scroll-to">Timelines</a></li>
+          <li><a href="#standard-nomenclature" class="scroll-to">Standard nomenclature</a></li>
+          <li><a href="#contributors" class="scroll-to">Contributors</a></li>
+          <li><a href="#contact" class="scroll-to">Contact</a></li>
+        </ul>
+      </div>
+    </div>
+  </div>
+
+  <div class="aside">
+  </div>
+</div>
diff --git a/app/static/about_page_fr.html b/app/static/about_page_fr.html
new file mode 100644
index 0000000..ea1b929
--- /dev/null
+++ b/app/static/about_page_fr.html
@@ -0,0 +1,160 @@
+<div class="wrap">
+  <div class="content">
+    <div class="c1">
+      <div class="content-left">
+        <h2><a id="cites-checklist">FR CITES Checklist</a></h2>
+        <p>
+        The <span class="bold">Checklist of CITES Species</span> provides the official list of CITES-listed species (scientific names)
+        and their associated scientific synonyms; common names in English, French and Spanish (where available) and the CITES Appendix
+        in which they are currently listed (see <a href="http://www.cites.org/eng/res/12/12-11R16.php">Resolution 12.11 (Rev CoP16)</a>).
+        Information on historical Appendix listings, reservations and level of listing (e.g. if a whole family or order is listed)
+        is also available through this website.
+        </p>
+
+        <h2><a id="web-display">Web display &#38; data downloads</a></h2>
+        <p>
+        Users can search for and view CITES listing information for CITES-listed species online. The scientific name, higher taxonomy,
+        scientific synonyms, common names, distribution, current listing and history of listings (in the form of timelines) are all visible
+        through the web display. Filters applied to the search and the Advanced options (see below) also affect the data displayed online.
+        </p>
+        <p>
+          Two distinct outputs are available for download through this website:
+        </p>
+        <ol>
+          <li><span class="bold italic">Index of CITES species:</span> an alphabetical list of all animal and plant taxa currently included in
+            the CITES Appendices; and </li>
+            <li><span class="bold italic">History of CITES listings:</span> a historical record of all CITES listings since 1975, including all
+            reservations and annotations ever made.</li>
+        </ol>
+        <p>
+          Both outputs are available in three different formats: PDF, csv (for use in Excel) and JSON format (for use by web developers).
+        </p>
+        <p><span class="bold">Note on csv files:</span> For the first time, users can now download the official list of CITES-listed species in
+        Excel-ready csv files. The csv files downloadable through this site use commas as separators;
+        this might conflict the regional settings of some computer systems.</p>
+
+        <p>
+          The full <span class="italic">Index of CITES species</span> and <span class="italic">History of CITES listings</span> are always available
+          on the right hand side of the website under <b>&#8220;Featured&#8221; </b>. In the   case of the <span class="italic">Index of CITES species</span>,
+          the full version of this can also be downloaded through the red &#8220;Download&#8221; button if no filters are selected.
+          In addition users also have the flexibility to produce tailored versions of the <span class="italic">Index of
+          CITES species</span> outputs depending on their needs. Most notably, users can filter by name (including higher taxa), CITES Appendix and
+          country/territory/region of occurrence (&#8220;All locations&#8221;).
+          These filters will then filter the data displayed on the website, as well as the data downloaded through the red &#8220;Download&#8221; button,
+          so that users can view and download smaller subsets of data.
+        </p> 
+        <p>
+        <span class="bold">Note</span>: Filters for country/territory/region of occurrence include all taxa associated with that geographic entity, including
+        taxa that are recorded as extinct, introduced or re-introduced in that area. Filters do not apply to the <span class="italic">History of CITES listings</span>
+        outputs, which are only available in full through the &#8220;History of listing&#8221; link under <b>&#8220;Featured&#8221; </b>.
+        </p>
+        <h3 class="bold">Browser compatibility</h3>
+        <p>This site is optimised for Internet Explorer 8, 9 and 10, Firefox, Safari and Google Chrome.
+          The site may not display properly in older browsers.</p>
+
+        <h2><a id="advanced-options">Advanced options:</a></h2>
+        <p>
+          Under &#8220;Advanced options&#8221; users are able to tailor the web display and Checklist outputs as follows:
+        </p>
+        <ul>
+          <li>
+          <span class="bold">Common names:</span> By de-selecting &#8216;ENG&#8217;, &#8216;SPA&#8217;, and &#8216;FRE&#8217;, this will remove the English, Spanish and
+          French common names on both the web display and within the Index downloads accessible through the red &#8220;Download&#8221; button;
+          </li>
+          <li>
+            <span class="bold">Online view:</span> Selecting &#8220;Alphabetical&#8221; or &#8216;Taxonomic&#8217; affects the way the taxonomic entities are sorted on the
+            web view only. The PDF and csv outputs will always be   sorted alphabetically. &#8220;Appendix&#8221; view, when selected, mirrors the display of the CITES Appendices,
+            showing taxa at the level at which they are listed in taxonomic   order. For instance, &#8220;Felidae spp.&#8221; will be included because there is a family
+            listing that applies, but species within Felidae that are included in the family level listing would not appear in the web display. NB: species included within
+            a higher level listing would not be searchable if this format is selected. 
+          </li>
+          <li>
+          <span class="bold">Display:</span> These options affect the information displayed for each taxon on the website.
+          </li>
+          
+            <ul>
+              <li> 
+                <span class="bold">Synonyms:</span> When ticked, scientific synonyms (where available) will be shown in the web display (and within the PDF and csv outputs for the
+                <span class="italic">Index of CITES species</span>). Unticking this will remove the synonyms from the web display and the tailored downloads.
+              </li>
+              <li>
+                <span class="bold">Author&#8217;s name:</span> When ticked, the author citations for taxa will be shown in the web display (and within the PDF and csv outputs).
+                Unticking this will remove the author citation from the web display and the tailored downloads.
+              </li>
+              <li>
+                <span class="bold">History of listing:</span> When ticked, the history of listing (displayed online as a timeline) will expand for all taxa on the page.
+                This does not impact the downloads.
+              </li>
+            </ul>
+          
+        </ul>
+        <h2><a id="timelines">Timelines:</a></h2>
+        <p>
+          Timelines provide a visual display of the history of CITES listings on the web display. Symbols on the timelines indicate the inclusion of a taxon in an
+          Appendix (&#8216;+&#8217;), the removal/deletion of a taxa from an Appendix (&#8216;-&#8217;), and a change to an annotation relevant to the Appendix listing
+          (&#8216;A&#8217;). For timelines displaying reservation information, &#8216;R&#8217; indicates a reservation that was entered by a Party and &#8220;W&#8221;
+          indicates that the Party has withdrawn the reservation. The exact date of the event can be viewed by hovering over the symbols; more details on the listings,
+          reservations or any changes to annotations can be viewed by clicking on the symbols associated with the timeline event. The Appendix symbol representing the
+          current listing (displayed to the right of the scientific name) is also clickable to view additional listing information or annotations that may apply.
+        </p>
+
+        <h2><a id="standard-nomenclature">Standard nomenclatural references used</a></h2>
+        <p>Taxonomic names that have been officially adopted by the Conference of the Parties [see the list of standard nomenclatural references in
+          <a href="http://www.cites.org/eng/res/12/12-11R16.php">Resolution Conf. 12.11 (Rev. CoP16)]</a> appear in boldface in the <span class="italic">Checklist</span>,
+          e.g. <span class="bold italic">Acinonyx jubatus</span> (the cheetah). This is the case for most taxa. In some cases, nevertheless, a standard nomenclatural reference
+          for the constituent species of a higher taxon has not yet been adopted. In such instances, a reference identified by UNEP-WCMC has been used. The names of these taxa
+          are not in boldface, e.g. <span class="italic">Tridacna maxima</span> (or any Tridacnidae species), as in previous printed versions of the <span class="italic">Checklist</span>.
+        </p>
+
+        <h2><a id="contributors">CITES Checklist contributors</a></h2>
+        <p>The CITES Checklist was developed by UNEP-WCMC on behalf of the CITES Secretariat.
+          Financial support to maintain this database has come from a range of sources, on a project 
+          or longer-term basis. Current funders, supporting portions of the maintenance of the underlying data include:
+          WCMC (UK), the European Union and the CITES Secretariat.</p>
+        <p>
+          This information resource is a result of long-term collaboration between countless individual scientists worldwide 
+          and many organizations whose contribution is gratefully acknowledged.
+        </p>
+
+
+        <h2><a id="contact">Contact</a></h2>
+        <div class="contacts">
+        <div class="left">
+          <span class="bold">CITES Secretariat</span><br>
+          International Environment House<br>
+          15, Chemin des Anémones<br>
+          CH 1219 Châtelaine (Geneva)<br>
+          Switzerland<br>
+          Tel: + 41 (0) 22 917 81 39/40<br>
+          Email: <a href="mailto:info@cites.org">info@cites.org</a><br>
+          Website: <a href="http://www.cites.org">www.cites.org</a><br>
+        </div>
+        <div class="right">
+          <span class="bold">UNEP World Conservation Monitoring Centre</span><br>
+          219 Huntingdon Road<br>
+          Cambridge<br>
+          CB3 0DL<br>
+          United Kingdom<br>
+          Tel: +44 (0) 1223 277314<br>
+          Email: <a href="mailto:species@unep-wcmc.org" target="_top">species@unep-wcmc.org</a><br>
+          Website: <a href="http://www.unep-wcmc.org">www.unep-wcmc.org</a><br>
+        </div>
+        </div>
+      </div>
+      <div class="menu-right">
+        <ul>
+          <li><a href="#cites-checklist" class="scroll-to">CITES Checklist</a></li>
+          <li><a href="#web-display" class="scroll-to">Web display &#38; data downloads</a></li>
+          <li><a href="#advanced-options" class="scroll-to">Advanced options</a></li>
+          <li><a href="#timelines" class="scroll-to">Timelines</a></li>
+          <li><a href="#standard-nomenclature" class="scroll-to">Standard nomenclature</a></li>
+          <li><a href="#contributors" class="scroll-to">Contributors</a></li>
+          <li><a href="#contact" class="scroll-to">Contact</a></li>
+        </ul>
+      </div>
+    </div>
+  </div>
+
+  <div class="aside">
+  </div>
+</div>
diff --git a/app/javascripts/templates/terms_of_use_page.handlebars b/app/static/terms_of_use_page_en.html
similarity index 100%
rename from app/javascripts/templates/terms_of_use_page.handlebars
rename to app/static/terms_of_use_page_en.html
diff --git a/app/static/terms_of_use_page_es.html b/app/static/terms_of_use_page_es.html
new file mode 100644
index 0000000..b5e2b92
--- /dev/null
+++ b/app/static/terms_of_use_page_es.html
@@ -0,0 +1,57 @@
+<div class="wrap">
+  <div class="content">
+    <div class="c1">
+        <h2>ES Terms and Conditions of Use of CITES Checklist Data</h2>
+
+        <h2>1. INTRODUCTION</h2>
+        <p>Access to the information, data and attribute data provided through CITES Checklist website (the "Materials") is provided to the User on the understanding that the User reads and consents to be bound to the Terms and Conditions set out below. For the purposes of this Agreement, Materials comprise all the species lists, checklists and other information made available for download and contained within any part of the CITES Checklist website.</p>
+
+        <p class="strong">PLEASE READ THESE TERMS AND CONDITIONS CAREFULLY. IF YOU DO NOT AGREE TO ANY OF THE TERMS AND CONDITIONS, DO NOT DOWNLOAD. BY DOWNLOADING THE MATERIALS MADE AVAILABLE ON THE CITES CHECKLIST WEBSITE THE USER ACCEPTS AND AGREES TO COMPLY WITH THE TERMS AND CONDITIONS BELOW.</p>
+
+        <h2>2. PUBLISHING</h2>
+        <p>You may publish the Materials in whole or in part, including on-line, providing (a) the Materials are not downloadable and (b) the proper attribution is clearly visible (see clause 5 below). You must ensure that the most recently available version of the Materials is being used and that the date of download is visible in the published version. Materials published online must provide a clear link to the original on-line source (checklist.cites.org). We strongly recommend that you have the relevant materials reviewed by the CITES Secretariat prior to publication. Applications for permission, with a statement of purpose and extent of reproduction, should be sent to the CITES Secretariat, International Environment House, 15, Chemin des Anémones, CH 1219 Châtelaine (Geneva), Switzerland or via email to
+          <a href="mailto:info@cites.org" target="_top">info@cites.org</a>
+        .</p>
+
+        <h2>3. NO SUB-LICENSING OR REDISTRIBUTION</h2>
+        <p>The Materials may not be sub-licensed in whole or in part including within Derivative Works without the prior written permission of the CITES Secretariat and UNEP. You may not redistribute the Materials in whole or in part by any means including (but not limited to) electronic formats such as web downloads, through web services, or through file transfer protocols. If you know of others who wish to use the Materials or if you wish to provide a service through which the Materials are downloadable or otherwise made available for redistribution you must contact 
+        <a href="mailto:info@cites.org" target="_top">info@cites.org</a> 
+        for permission and further guidance.</p>
+
+        <h2>4. NO COMMERCIAL USE</h2>
+        <p>Neither (a) the Materials nor (b) any work derived from or based upon the Materials (“Derivative Works”) may be put to Commercial Use without the prior written permission of the CITES Secretariat and UNEP. For the purposes of these Terms and Conditions, “Commercial Use” means any use to generate revenue. 
+        To apply for permission for Commercial Use of the Materials please send an email to <a href="mailto:info@cites.org" target="_top">info@cites.org</a> 
+        outlining your needs.</p>
+
+        <h2>5. ATTRIBUTION</h2>
+        <p>You must ensure that the citation set out below is always clearly reproduced in any publication or analysis involving the CITES Checklist data, in any derived form or format:</p>
+        <p>UNEP-WCMC (Comps.) 2013. The Checklist of CITES Species Website. CITES Secretariat, Geneva, Switzerland. Compiled by UNEP-WCMC, Cambridge, UK. Available at: <a href="http://checklist.cites.org">http://checklist.cites.org</a>. [Accessed (please insert date of download dd/mm/yyyy)].</p>
+
+        <h2>6. NO GRANT OF INTELLECTUAL PROPERTY RIGHTS</h2>
+        <p>No rights in the Materials are granted to the User by virtue of these Terms and Conditions or as a result of any use of the Materials. </p>
+
+        <h2>7. NO WARRANTY AND WAIVER OF LIABILITY</h2>
+        <p>While the CITES Secretariat and UNEP strive to ensure accuracy and keep the Materials up-to-date, the Materials are provided to the User &#8216;as is&#8217; and no warranty of any kind is given as to its completeness or accuracy . All warranties, representations and conditions, express or implied, are hereby excluded to the fullest extent permitted. The User agrees to download and make use of the Materials entirely at his or her own risk. The User waives and releases the CITES Secretariat and UNEP from any liability whatsoever, wherever and howsoever arising in connection with any use of the Materials or Derivative Works. The CITES Secretariat and UNEP will not be liable on any grounds (including without limitation negligence, strict liability or under any other legal theory) for any loss or damage (direct or indirect) incurred by the User or any third party as a result of the use of the Materials or any Derivative Works. The User also indemnifies and holds harmless the CITES Secretariat and UNEP in respect of any loss or damage (direct or indirect) suffered by any third party as a result of any use by that third party of any Materials or Derivative Works published the User. Without limitation to the above, any damage occurring to computer systems as a result of attempts to download Materials is entirely the User’s responsibility.</p>
+
+        <h2>8. DISCLAIMERS</h2>
+        <p>The contents of this website do not necessarily reflect the views or policies of the CITES Secretariat and UNEP, contributory organisations or editors. The designations employed and the presentations of material in this report do not imply the expression of any opinion whatsoever on the part of the CITES Secretariat and UNEP or contributory organisations, editors or publishers concerning the legal status of any country or territory.</p>
+
+        <h2>9. FEEDBACK</h2>
+        <p>The User agrees to provide feedback on the quality, reliability and accuracy of the Materials where these may become apparent.</p>
+
+        <h2>10. CHANGES TO THESE TERMS AND CONDITIONS</h2>
+        <p>The CITES Secretariat and UNEP reserve the right to vary these Terms and Conditions from time to time without notice. Therefore please ensure that you read these Terms and Conditions each time you download Materials. By downloading Materials you signify your acceptance of the most recent version of these Terms and Conditions in full.</p>
+
+        <h2>11. DISPUTE RESOLUTION</h2>
+        <p>Any dispute arising out of or in connection with any use of the Materials shall be settled by amicable negotiation with the CITES Checklist suppliers. Should attempts at amicable negotiation fail, any such dispute shall, upon request by either the User or the CITES Checklist suppliers, be referred to arbitration in accordance with the UNCITRAL arbitration rules then prevailing.</p>
+
+        <h2>12. COMMUNICATION</h2>
+        <p>Any communication with respect to these Terms and Conditions and any issue arising from them shall be in writing, in English, and sent by email. The address for communication with the CITES Checklist supplier is <a href="mailto:info@cites.org" target="_top">info@cites.org</a> 
+        .</p>
+      </div>
+    </div>
+  </div>
+
+  <div class="aside">
+  </div>
+</div>
diff --git a/app/static/terms_of_use_page_fr.html b/app/static/terms_of_use_page_fr.html
new file mode 100644
index 0000000..d1126c6
--- /dev/null
+++ b/app/static/terms_of_use_page_fr.html
@@ -0,0 +1,57 @@
+<div class="wrap">
+  <div class="content">
+    <div class="c1">
+        <h2>FR Terms and Conditions of Use of CITES Checklist Data</h2>
+
+        <h2>1. INTRODUCTION</h2>
+        <p>Access to the information, data and attribute data provided through CITES Checklist website (the "Materials") is provided to the User on the understanding that the User reads and consents to be bound to the Terms and Conditions set out below. For the purposes of this Agreement, Materials comprise all the species lists, checklists and other information made available for download and contained within any part of the CITES Checklist website.</p>
+
+        <p class="strong">PLEASE READ THESE TERMS AND CONDITIONS CAREFULLY. IF YOU DO NOT AGREE TO ANY OF THE TERMS AND CONDITIONS, DO NOT DOWNLOAD. BY DOWNLOADING THE MATERIALS MADE AVAILABLE ON THE CITES CHECKLIST WEBSITE THE USER ACCEPTS AND AGREES TO COMPLY WITH THE TERMS AND CONDITIONS BELOW.</p>
+
+        <h2>2. PUBLISHING</h2>
+        <p>You may publish the Materials in whole or in part, including on-line, providing (a) the Materials are not downloadable and (b) the proper attribution is clearly visible (see clause 5 below). You must ensure that the most recently available version of the Materials is being used and that the date of download is visible in the published version. Materials published online must provide a clear link to the original on-line source (checklist.cites.org). We strongly recommend that you have the relevant materials reviewed by the CITES Secretariat prior to publication. Applications for permission, with a statement of purpose and extent of reproduction, should be sent to the CITES Secretariat, International Environment House, 15, Chemin des Anémones, CH 1219 Châtelaine (Geneva), Switzerland or via email to
+          <a href="mailto:info@cites.org" target="_top">info@cites.org</a>
+        .</p>
+
+        <h2>3. NO SUB-LICENSING OR REDISTRIBUTION</h2>
+        <p>The Materials may not be sub-licensed in whole or in part including within Derivative Works without the prior written permission of the CITES Secretariat and UNEP. You may not redistribute the Materials in whole or in part by any means including (but not limited to) electronic formats such as web downloads, through web services, or through file transfer protocols. If you know of others who wish to use the Materials or if you wish to provide a service through which the Materials are downloadable or otherwise made available for redistribution you must contact 
+        <a href="mailto:info@cites.org" target="_top">info@cites.org</a> 
+        for permission and further guidance.</p>
+
+        <h2>4. NO COMMERCIAL USE</h2>
+        <p>Neither (a) the Materials nor (b) any work derived from or based upon the Materials (“Derivative Works”) may be put to Commercial Use without the prior written permission of the CITES Secretariat and UNEP. For the purposes of these Terms and Conditions, “Commercial Use” means any use to generate revenue. 
+        To apply for permission for Commercial Use of the Materials please send an email to <a href="mailto:info@cites.org" target="_top">info@cites.org</a> 
+        outlining your needs.</p>
+
+        <h2>5. ATTRIBUTION</h2>
+        <p>You must ensure that the citation set out below is always clearly reproduced in any publication or analysis involving the CITES Checklist data, in any derived form or format:</p>
+        <p>UNEP-WCMC (Comps.) 2013. The Checklist of CITES Species Website. CITES Secretariat, Geneva, Switzerland. Compiled by UNEP-WCMC, Cambridge, UK. Available at: <a href="http://checklist.cites.org">http://checklist.cites.org</a>. [Accessed (please insert date of download dd/mm/yyyy)].</p>
+
+        <h2>6. NO GRANT OF INTELLECTUAL PROPERTY RIGHTS</h2>
+        <p>No rights in the Materials are granted to the User by virtue of these Terms and Conditions or as a result of any use of the Materials. </p>
+
+        <h2>7. NO WARRANTY AND WAIVER OF LIABILITY</h2>
+        <p>While the CITES Secretariat and UNEP strive to ensure accuracy and keep the Materials up-to-date, the Materials are provided to the User &#8216;as is&#8217; and no warranty of any kind is given as to its completeness or accuracy . All warranties, representations and conditions, express or implied, are hereby excluded to the fullest extent permitted. The User agrees to download and make use of the Materials entirely at his or her own risk. The User waives and releases the CITES Secretariat and UNEP from any liability whatsoever, wherever and howsoever arising in connection with any use of the Materials or Derivative Works. The CITES Secretariat and UNEP will not be liable on any grounds (including without limitation negligence, strict liability or under any other legal theory) for any loss or damage (direct or indirect) incurred by the User or any third party as a result of the use of the Materials or any Derivative Works. The User also indemnifies and holds harmless the CITES Secretariat and UNEP in respect of any loss or damage (direct or indirect) suffered by any third party as a result of any use by that third party of any Materials or Derivative Works published the User. Without limitation to the above, any damage occurring to computer systems as a result of attempts to download Materials is entirely the User’s responsibility.</p>
+
+        <h2>8. DISCLAIMERS</h2>
+        <p>The contents of this website do not necessarily reflect the views or policies of the CITES Secretariat and UNEP, contributory organisations or editors. The designations employed and the presentations of material in this report do not imply the expression of any opinion whatsoever on the part of the CITES Secretariat and UNEP or contributory organisations, editors or publishers concerning the legal status of any country or territory.</p>
+
+        <h2>9. FEEDBACK</h2>
+        <p>The User agrees to provide feedback on the quality, reliability and accuracy of the Materials where these may become apparent.</p>
+
+        <h2>10. CHANGES TO THESE TERMS AND CONDITIONS</h2>
+        <p>The CITES Secretariat and UNEP reserve the right to vary these Terms and Conditions from time to time without notice. Therefore please ensure that you read these Terms and Conditions each time you download Materials. By downloading Materials you signify your acceptance of the most recent version of these Terms and Conditions in full.</p>
+
+        <h2>11. DISPUTE RESOLUTION</h2>
+        <p>Any dispute arising out of or in connection with any use of the Materials shall be settled by amicable negotiation with the CITES Checklist suppliers. Should attempts at amicable negotiation fail, any such dispute shall, upon request by either the User or the CITES Checklist suppliers, be referred to arbitration in accordance with the UNCITRAL arbitration rules then prevailing.</p>
+
+        <h2>12. COMMUNICATION</h2>
+        <p>Any communication with respect to these Terms and Conditions and any issue arising from them shall be in writing, in English, and sent by email. The address for communication with the CITES Checklist supplier is <a href="mailto:info@cites.org" target="_top">info@cites.org</a> 
+        .</p>
+      </div>
+    </div>
+  </div>
+
+  <div class="aside">
+  </div>
+</div>

From 840f001eaacea339389b764f1d31794f0b2ea799 Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Tue, 25 Mar 2014 15:30:45 +0000
Subject: [PATCH 24/58] [#65553094] workaround the error with passing search
 params during locale switch

---
 app/javascripts/routers/router.js | 47 ++++++++++++++++++++++---------
 1 file changed, 34 insertions(+), 13 deletions(-)

diff --git a/app/javascripts/routers/router.js b/app/javascripts/routers/router.js
index e9019d5..d0a9fda 100644
--- a/app/javascripts/routers/router.js
+++ b/app/javascripts/routers/router.js
@@ -97,7 +97,40 @@ Checklist.Router = Ember.Router.extend({
             router.transitionTo('index');
           });
         }
-      })
+      }),
+
+      doLocaleEN: function(router, event) {
+        var newLocale = 'en';
+        var newState;
+        if (router.get('currentState.name') == 'search'){
+          newState = 'index';
+        } else {
+          newState = router.get('currentState.name');
+        }
+        router.transitionTo(newState, {locale: newLocale});
+      },
+
+      doLocaleES: function(router, event) {
+        var newLocale = 'es';
+        var newState;
+        if (router.get('currentState.name') == 'search'){
+          newState = 'index';
+        } else {
+          newState = router.get('currentState.name');
+        }
+        router.transitionTo(newState, {locale: newLocale});
+      },
+
+      doLocaleFR: function(router, event) {
+        var newLocale = 'fr';
+        var newState;
+        if (router.get('currentState.name') == 'search'){
+          newState = 'index';
+        } else {
+          newState = router.get('currentState.name');
+        }
+        router.transitionTo(newState, {locale: newLocale});
+      }
     }),
 
     doHome: function(router, event) {
@@ -110,18 +143,6 @@ Checklist.Router = Ember.Router.extend({
 
     doTermsOfUse: function(router, event) {
       router.transitionTo('termsOfUse');
-    },
-
-    doLocaleEN: function(router) {
-      router.transitionTo(router.get('currentPath'), {locale: 'en'});
-    },
-
-    doLocaleES: function(router) {
-      router.transitionTo(router.get('currentPath'), {locale: 'es'});
-    },
-
-    doLocaleFR: function(router) {
-      router.transitionTo(router.get('currentPath'), {locale: 'fr'});
     }
   })
 });

From 6fbcac4767a27aee6aa960ad3e6adb85e1d8a05d Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Wed, 26 Mar 2014 17:06:32 +0000
Subject: [PATCH 25/58] [#65553094] removed locale from filters controller, use
 global var

---
 app/javascripts/controllers/filters_controller.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/javascripts/controllers/filters_controller.js b/app/javascripts/controllers/filters_controller.js
index 32d0c17..e5217cf 100644
--- a/app/javascripts/controllers/filters_controller.js
+++ b/app/javascripts/controllers/filters_controller.js
@@ -19,7 +19,6 @@ Checklist.FiltersController = Ember.Object.extend({
   showFrench : true,
   scientificName : "",
   geoEntityName : "",
-  locale: Em.I18n.currentLocale,
   autoCompleteCountriesContent : [],
   autoCompleteRegionsContent : [],
   searches : [],
@@ -97,8 +96,7 @@ Checklist.FiltersController = Ember.Object.extend({
       show_french : this.get('showFrench') === true ? 1 : 0,
       scientific_name : this.get('scientificName'),
       page : this.get('page'),
-      per_page : this.get('per_page'),
-      locale : Em.I18n.currentLocale
+      per_page : this.get('per_page')
     };
   },
 
@@ -109,8 +107,7 @@ Checklist.FiltersController = Ember.Object.extend({
       show_english : 1,
       show_spanish : 1,
       show_french : 1,
-      intro : 1,
-      locale : Em.I18n.currentLocale
+      intro : 1
     };
   },
 

From f9c8e83a9262801ab9fd40b8dd6151e4b7ace68a Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Wed, 26 Mar 2014 17:10:34 +0000
Subject: [PATCH 26/58] [#65553094] pass locale to full downloads

---
 app/javascripts/views/quick_links.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascripts/views/quick_links.js b/app/javascripts/views/quick_links.js
index e754dc7..01d778e 100644
--- a/app/javascripts/views/quick_links.js
+++ b/app/javascripts/views/quick_links.js
@@ -8,6 +8,6 @@ Checklist.QuickLinksView = Ember.View.extend({
     window.location = Checklist.store.adapter.url +
       Checklist.Download.collectionUrl + 'download_' +
       $(event.target).attr('data-doc-type') +
-      "?" + $.param($.extend(params, {format: format}));
+      "?" + $.param($.extend(params, {format: format, locale: Em.I18n.currentLocale}));
   }
 });

From 56014e6c60b5ca0a1c43240397947ed81cdf8a96 Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Tue, 8 Apr 2014 12:47:41 +0200
Subject: [PATCH 27/58] added Spanish and French website translations

---
 app/javascripts/locales/en.js |   3 +
 app/javascripts/locales/es.js | 201 +++++++++++++++++-----------------
 app/javascripts/locales/fr.js | 201 +++++++++++++++++-----------------
 3 files changed, 207 insertions(+), 198 deletions(-)

diff --git a/app/javascripts/locales/en.js b/app/javascripts/locales/en.js
index 0cf68e2..3ccb5e2 100644
--- a/app/javascripts/locales/en.js
+++ b/app/javascripts/locales/en.js
@@ -52,6 +52,9 @@ Em.I18n.locales.en = {
   'advanced.display.unfold_history': 'History of listing',
   'advanced.downloads': 'Downloads',
   'advanced.downloads.include_intro':  'Include introduction in PDF',
+  'advanced.downloads.separator': 'CSV separator',
+  'advanced.downloads.separator.comma': 'comma',
+  'advanced.downloads.separator.semicolon': 'semicolon',
 
   'downloads.button': 'Download',
   'downloads.popup.title': 'Download Taxa',
diff --git a/app/javascripts/locales/es.js b/app/javascripts/locales/es.js
index cb8144a..87cdf60 100644
--- a/app/javascripts/locales/es.js
+++ b/app/javascripts/locales/es.js
@@ -1,101 +1,104 @@
 Em.I18n.locales.es = {
-  'title': 'ES Checklist of CITES Species',
-  'about.title': 'ES About the CITES Checklist',
-  'terms.title': 'ES Terms of Use',
-  'toplink.about': 'ES About',
-  'toplink.terms': 'ES Terms of Use',
-  'powered.by': 'ES Powered By',
-
-  'search.by_taxon.button': 'ES SEARCH',
-  'search.by_taxon.placeholder': 'ES Species, higher taxon, synonym or common name...',
-  'search.by_appendix.all': 'ES All',
-  'search.by_appendix.appxs': 'ES Appxs.',
-
-  'search.by_location.placeholder': 'ES Type to filter countries or regions',
-  'search.by_location.selected': 'ES Selected Locations',
-  'search.by_location.regions': 'ES Regions',
-  'search.by_location.countries': 'ES Countries and territories',
-
-  'search.clear': 'ES Clear Search',
-  'search.no_results': 'ES Your search did not match any taxa.',
-  'search.results.page': 'ES Page',
-
-  'search.result.show_history': 'ES Show History',
-  'search.result.hide_history': 'ES Hide History',
-  'distribution.more': 'ES and {{count}} more.',
-  'distribution.see_all': 'ES See all...',
-
-  'timeline.party': 'ES See reservations to CITES listings',
-  'timeline.split': 'ES NB: this taxon is split-listed. See also timeline(s) for lower taxa.',
-  'timeline.nohistory': 'ES No history information is available for this taxon.',
-  'timeline.reservations': 'ES Appendix-{{appendix}} reservations:',
-  'timeline.event.appendix': 'ES CITES Appendix {{appendix}}',
-  'timeline.event.symbol.amendment': 'ES A',
-  'timeline.event.symbol.reservation': 'ES R',
-  'timeline.event.symbol.reservation_withdrawal': 'ES W',
-  'timeline.event.description.addition': 'ES APPENDIX',
-  'timeline.event.description.reservation': 'ES RESERVATION',
-  'timeline.event.description.reservation_withdrawal': 'ES RESERVATION WITHDRAWAL',
-
-  'advanced.title': 'ES Advanced Options',
-  'advanced.common_names': 'ES COMMON NAMES',
-  'advanced.common_names.en': 'ES ENG',
-  'advanced.common_names.es': 'ES SPA',
-  'advanced.common_names.fr': 'ES FRE',
-  'advanced.online_view': 'ES Online view',
-  'advanced.online_view.alphabetical': 'ES Alphabetical',
-  'advanced.online_view.taxonomic': 'ES Taxonomic',
-  'advanced.online_view.appendix': 'ES Appendix',
-  'advanced.display': 'ES DISPLAY',
-  'advanced.display.synonyms': 'ES Synonyms',
-  'advanced.display.author_name': 'ES Author\'s name',
-  'advanced.display.unfold_history': 'ES History of listing',
-  'advanced.downloads': 'ES Downloads',
-  'advanced.downloads.include_intro':  'Include introduction in PDF',
-
-  'downloads.button': 'ES Download',
-  'downloads.popup.title': 'ES Download Taxa',
-  'downloads.popup.info': 'ES Please select the format of your choice',
-
-  'download.button': 'ES Download',
-  'download.failed': 'ES Failed.',
-  'download.remove': 'ES Remove?',
-  'download.spinner': 'ES Downloading...',
-
-  'saved_search.button': 'ES SAVE THIS',
-  'saved_search.count.zero': 'ES ',
-  'saved_search.count.one': 'ES 1 saved search',
-  'saved_search.count.other': 'ES {{count}} saved searches',
-
-  'featured.title': 'ES Featured',
-  'featured.index': 'ES Full species list',
-  'featured.history': 'ES History of listings',
-  'featured.format': 'ES Format',
-
-  'locations.count.zero': 'ES All Locations',
-  'locations.count.one': 'ES 1 Location',
-  'locations.count.other': 'ES {{count}} Locations',
-
-  'reports.count.zero': 'ES ',
-  'reports.count.one': 'ES Generating 1 report',
-  'reports.count.other': 'ES Generating {{count}} reports',
-
-  'reports.ready.count.zero': 'ES ',
-  'reports.ready.count.one': 'ES 1 report ready',
-  'reports.ready.count.other': 'ES {{count}} reports ready',
-
-  'reports.failed.count.zero': 'ES ',
-  'reports.failed.count.one': 'ES 1 report failed',
-  'reports.failed.count.other': 'ES {{count}} reports failed',
-
-  'reports.failed.description': 'ES You can restart a download, or remove it from the list.',
-  'reports.generating.description': 'ES It can take some time, but you can close this window and continue working in other CITES Checklist reports.',
-
-  'reports.ready.title': 'ES Your Reports',
-  'reports.generating.title': 'ES Currently Generating Reportings',
-  'reports.latest.title': 'ES Your report is being generated',
-
-  'splash.p1': 'ES CITES (the Convention on International Trade in Endangered Species of Wild Fauna and Flora) is an international agreement between governments that aims to ensure that international trade in specimens of wild animals and plants does not threaten their survival.',
-  'splash.p2': 'ES The Checklist of CITES Species allows the exploration of more than 35,000 species of animals and plants and their degree of protection.',
-  'splash.button': 'ES Start Exploring'
+  'title': 'Lista de especies CITES',
+  'about.title': 'Acerca de la Lista de especies CITES',
+  'terms.title': 'Condiciones de uso',
+  'toplink.about': 'Acerca de',
+  'toplink.terms': 'Condiciones de uso',
+  'powered.by': 'Proporcionada por',
+
+  'search.by_taxon.button': 'BUSCAR',
+  'search.by_taxon.placeholder': 'Especie, taxón superior, sinónimo o nombre común...',
+  'search.by_appendix.all': 'Todos los',
+  'search.by_appendix.appxs': 'apénd.',
+
+  'search.by_location.placeholder': 'Escriba para filtrar países o regiones',
+  'search.by_location.selected': 'Ubicaciones seleccionadas',
+  'search.by_location.regions': 'Regiones',
+  'search.by_location.countries': 'Países y territorios',
+
+  'search.clear': 'Borrar el resultado de la búsqueda',
+  'search.no_results': 'Su búsqueda no encontró ningún taxón.',
+  'search.results.page': 'Página',
+
+  'search.result.show_history': 'Mostrar historial',
+  'search.result.hide_history': 'Ocultar historial',
+  'distribution.more': 'y {{count}} más.',
+  'distribution.see_all': 'Ver todos...',
+
+  'timeline.party': 'Ver reservas a inclusiones en los Apéndices de la CITES',
+  'timeline.split': 'NB: inclusión dividida para este taxón. Vea también la(s) línea(s) de tiempo para los taxones inferiores.',
+  'timeline.nohistory': 'No hay información de historial para este taxón.',
+  'timeline.reservations': 'Reservas al Apéndice {{appendix}}:',
+  'timeline.event.appendix': 'Apéndice {{appendix}} de la CITES',
+  'timeline.event.symbol.amendment': 'A',
+  'timeline.event.symbol.reservation': 'R',
+  'timeline.event.symbol.reservation_withdrawal': 'W',
+  'timeline.event.description.addition': 'APÉNDICE',
+  'timeline.event.description.reservation': 'RESERVA',
+  'timeline.event.description.reservation_withdrawal': 'RETIRO DE RESERVA',
+
+  'advanced.title': 'Opciones avanzadas',
+  'advanced.common_names': 'NOMBRES COMUNES',
+  'advanced.common_names.en': 'ENG',
+  'advanced.common_names.es': 'SPA',
+  'advanced.common_names.fr': 'FRE',
+  'advanced.online_view': 'Vista en línea',
+  'advanced.online_view.alphabetical': 'Alfabética',
+  'advanced.online_view.taxonomic': 'Taxonómica',
+  'advanced.online_view.appendix': 'APÉNDICE',
+  'advanced.display': 'MOSTRAR',
+  'advanced.display.synonyms': 'Sinónimos',
+  'advanced.display.author_name': 'Nombre del autor',
+  'advanced.display.unfold_history': 'Historial de inclusión',
+  'advanced.downloads': 'Descargar',
+  'advanced.downloads.include_intro': 'Incluir introducción en PDF',
+  'advanced.downloads.separator': 'Separador de CSV',
+  'advanced.downloads.separator.comma': 'coma',
+  'advanced.downloads.separator.semicolon': 'punto y coma',
+
+  'downloads.button': 'Descargar',
+  'downloads.popup.title': 'Descargar taxones',
+  'downloads.popup.info': 'Seleccione el formato preferido',
+
+  'download.button': 'Descargar',
+  'download.failed': 'Se produjo un error.',
+  'download.remove': '¿Quitar?',
+  'download.spinner': 'Descargando...',
+
+  'saved_search.button': 'GUARDAR ESTA',
+  'saved_search.count.zero': '',
+  'saved_search.count.one': '1 búsqueda guardada',
+  'saved_search.count.other': '{{count}} búsquedas guardadas',
+
+  'featured.title': 'Destacados',
+  'featured.index': 'Lista completa de especies',
+  'featured.history': 'Historial de inclusiones',
+  'featured.format': 'Formato',
+
+  'locations.count.zero': 'Todas las ubicaciones',
+  'locations.count.one': '1 ubicación',
+  'locations.count.other': '{{count}} ubicaciones',
+
+  'reports.count.zero': '',
+  'reports.count.one': 'Generando 1 informe',
+  'reports.count.other': 'Generando {{count}} informes',
+
+  'reports.ready.count.zero': '',
+  'reports.ready.count.one': '1 informe listo',
+  'reports.ready.count.other': '{{count}} informes listos',
+
+  'reports.failed.count.zero': '',
+  'reports.failed.count.one': 'Se produjo un error en 1 informe',
+  'reports.failed.count.other': 'Se produjo un error en {{count}} informes',
+
+  'reports.failed.description': 'Puede reiniciar una descarga, o bien quitarla de la lista.',
+  'reports.generating.description': 'Puede demorar cierto tiempo, pero usted puede cerrar esta ventana y continuar trabajando con otros informes de la Lista de especies CITES.',
+
+  'reports.ready.title': 'Sus informes',
+  'reports.generating.title': 'Generando informes actualmente',
+  'reports.latest.title': 'Se ha generado su informe',
+
+  'splash.p1': 'La CITES (la Convención sobre el Comercio Internacional de Especies Amenazadas de Fauna y Flora Silvestres) es un acuerdo internacional concertado entre los gobiernos. Tiene por finalidad velar por que el comercio internacional de especímenes de animales y plantas silvestres no constituya una amenaza para su supervivencia.',
+  'splash.p2': 'La Lista de especies CITES le permite explorar más de 35.000 especies de animales y plantas y su grado de protección.',
+  'splash.button': 'Comenzar a explorar'
 };
diff --git a/app/javascripts/locales/fr.js b/app/javascripts/locales/fr.js
index e5f9200..71d000f 100644
--- a/app/javascripts/locales/fr.js
+++ b/app/javascripts/locales/fr.js
@@ -1,101 +1,104 @@
 Em.I18n.locales.fr = {
-  'title': 'FR Checklist of CITES Species',
-  'about.title': 'FR About the CITES Checklist',
-  'terms.title': 'FR Terms of Use',
-  'toplink.about': 'FR About',
-  'toplink.terms': 'FR Terms of Use',
-  'powered.by': 'FR Powered By',
-
-  'search.by_taxon.button': 'FR SEARCH',
-  'search.by_taxon.placeholder': 'FR Species, higher taxon, synonym or common name...',
-  'search.by_appendix.all': 'FR All',
-  'search.by_appendix.appxs': 'FR Appxs.',
-
-  'search.by_location.placeholder': 'FR Type to filter countries or regions',
-  'search.by_location.selected': 'FR Selected Locations',
-  'search.by_location.regions': 'FR Regions',
-  'search.by_location.countries': 'FR Countries and territories',
-
-  'search.clear': 'FR Clear Search',
-  'search.no_results': 'FR Your search did not match any taxa.',
-  'search.results.page': 'FR Page',
-
-  'search.result.show_history': 'FR Show History',
-  'search.result.hide_history': 'FR Hide History',
-  'distribution.more': 'FR and {{count}} more.',
-  'distribution.see_all': 'FR See all...',
-
-  'timeline.party': 'FR See reservations to CITES listings',
-  'timeline.split': 'FR NB: this taxon is split-listed. See also timeline(s) for lower taxa.',
-  'timeline.nohistory': 'FR No history information is available for this taxon.',
-  'timeline.reservations': 'FR Appendix-{{appendix}} reservations:',
-  'timeline.event.appendix': 'FR CITES Appendix {{appendix}}',
-  'timeline.event.symbol.amendment': 'FR A',
-  'timeline.event.symbol.reservation': 'FR R',
-  'timeline.event.symbol.reservation_withdrawal': 'FR W',
-  'timeline.event.description.addition': 'FR APPENDIX',
-  'timeline.event.description.reservation': 'FR RESERVATION',
-  'timeline.event.description.reservation_withdrawal': 'FR RESERVATION WITHDRAWAL',
-
-  'advanced.title': 'FR Advanced Options',
-  'advanced.common_names': 'FR COMMON NAMES',
-  'advanced.common_names.en': 'FR ENG',
-  'advanced.common_names.es': 'FR SPA',
-  'advanced.common_names.fr': 'FR FRE',
-  'advanced.online_view': 'FR Online view',
-  'advanced.online_view.alphabetical': 'FR Alphabetical',
-  'advanced.online_view.taxonomic': 'FR Taxonomic',
-  'advanced.online_view.appendix': 'FR Appendix',
-  'advanced.display': 'FR DISPLAY',
-  'advanced.display.synonyms': 'FR Synonyms',
-  'advanced.display.author_name': 'FR Author\'s name',
-  'advanced.display.unfold_history': 'FR History of listing',
-  'advanced.downloads': 'FR Downloads',
-  'advanced.downloads.include_intro':  'Include introduction in PDF',
-
-  'downloads.button': 'FR Download',
-  'downloads.popup.title': 'FR Download Taxa',
-  'downloads.popup.info': 'FR Please select the format of your choice',
-
-  'download.button': 'FR Download',
-  'download.failed': 'FR Failed.',
-  'download.remove': 'FR Remove?',
-  'download.spinner': 'FR Downloading...',
-
-  'saved_search.button': 'FR SAVE THIS',
-  'saved_search.count.zero': 'FR ',
-  'saved_search.count.one': 'FR 1 saved search',
-  'saved_search.count.other': 'FR {{count}} saved searches',
-
-  'featured.title': 'FR Featured',
-  'featured.index': 'FR Full species list',
-  'featured.history': 'FR History of listings',
-  'featured.format': 'FR Format',
-
-  'locations.count.zero': 'FR All Locations',
-  'locations.count.one': 'FR 1 Location',
-  'locations.count.other': 'FR {{count}} Locations',
-
-  'reports.count.zero': 'FR ',
-  'reports.count.one': 'FR Generating 1 report',
-  'reports.count.other': 'FR Generating {{count}} reports',
-
-  'reports.ready.count.zero': 'FR ',
-  'reports.ready.count.one': 'FR 1 report ready',
-  'reports.ready.count.other': 'FR {{count}} reports ready',
-
-  'reports.failed.count.zero': 'FR ',
-  'reports.failed.count.one': 'FR 1 report failed',
-  'reports.failed.count.other': 'FR {{count}} reports failed',
-
-  'reports.failed.description': 'FR You can restart a download, or remove it from the list.',
-  'reports.generating.description': 'FR It can take some time, but you can close this window and continue working in other CITES Checklist reports.',
-
-  'reports.ready.title': 'FR Your Reports',
-  'reports.generating.title': 'FR Currently Generating Reportings',
-  'reports.latest.title': 'FR Your report is being generated',
-
-  'splash.p1': 'FR CITES (the Convention on International Trade in Endangered Species of Wild Fauna and Flora) is an international agreement between governments that aims to ensure that international trade in specimens of wild animals and plants does not threaten their survival.',
-  'splash.p2': 'FR The Checklist of CITES Species allows the exploration of more than 35,000 species of animals and plants and their degree of protection.',
-  'splash.button': 'FR Start Exploring'
+  'title': 'Liste de contrôle des espèces CITES',
+  'about.title': 'A propos de la liste de contrôle CITES',
+  'terms.title': 'Conditions d\'utilisation',
+  'toplink.about': 'A propos de',
+  'toplink.terms': 'Conditions d\'utilisation',
+  'powered.by': 'Moteur de recherche',
+
+  'search.by_taxon.button': 'RECHERCHE',
+  'search.by_taxon.placeholder': 'Espèce, taxon supérieur, synonyme ou nom commun',
+  'search.by_appendix.all': 'Tout',
+  'search.by_appendix.appxs': 'Annexes',
+
+  'search.by_location.placeholder': 'Taper pour filtrer par pays ou par région',
+  'search.by_location.selected': 'Localisations sélectionnées',
+  'search.by_location.regions': 'Régions',
+  'search.by_location.countries': 'Pays et territoires',
+
+  'search.clear': 'Effacer la recherche',
+  'search.no_results': 'Aucun taxon ne correspond à votre recherche',
+  'search.results.page': 'Page',
+
+  'search.result.show_history': 'Afficher l\'historique',
+  'search.result.hide_history': 'Masquer l\'historique',
+  'distribution.more': 'et {{count}} supplémentaire(s)',
+  'distribution.see_all': 'Voir tous les...',
+
+  'timeline.party': 'Voir les réserves à l\'encontre des inscriptions CITES',
+  'timeline.split': 'NB: ce taxon fait l\'objet d\'une inscription scindée; voir également le(s) calendrier(s) pour les taxons inférieurs',
+  'timeline.nohistory': 'Aucun historique n\'est disponible pour ce taxon',
+  'timeline.reservations': 'Annexe-{{appendix}}, réserves',
+  'timeline.event.appendix': 'Annexe CITES-{{appendix}} ',
+  'timeline.event.symbol.amendment': 'A',
+  'timeline.event.symbol.reservation': 'R',
+  'timeline.event.symbol.reservation_withdrawal': 'RT',
+  'timeline.event.description.addition': 'ANNEXE',
+  'timeline.event.description.reservation': 'RESERVE',
+  'timeline.event.description.reservation_withdrawal': 'RETRAIT D\'UNE RESERVE',
+
+  'advanced.title': 'Options avancées',
+  'advanced.common_names': 'NOMS COMMUNS',
+  'advanced.common_names.en': 'Anglais',
+  'advanced.common_names.es': 'Espagnol',
+  'advanced.common_names.fr': 'Français',
+  'advanced.online_view': 'Affichage en ligne',
+  'advanced.online_view.alphabetical': 'Alphabétique',
+  'advanced.online_view.taxonomic': 'Taxonomique',
+  'advanced.online_view.appendix': 'Annexe',
+  'advanced.display': 'AFFICHER',
+  'advanced.display.synonyms': 'Synonymes',
+  'advanced.display.author_name': 'Nom de l\'auteur',
+  'advanced.display.unfold_history': 'Historique des inscriptions',
+  'advanced.downloads': 'Télécharger',
+  'advanced.downloads.include_intro': 'Comprend une introduction en PDF',
+  'advanced.downloads.separator': 'séparateur de fichiers CSV',
+  'advanced.downloads.separator.comma': 'virgule',
+  'advanced.downloads.separator.semicolon': 'point-virgule',
+
+  'downloads.button': 'Télécharger',
+  'downloads.popup.title': 'Télécharger les taxa',
+  'downloads.popup.info': 'Sélectionnez le format au choix',
+
+  'download.button': 'Télécharger',
+  'download.failed': 'Echec',
+  'download.remove': 'Supprimer?',
+  'download.spinner': 'En cours de téléchargement...',
+
+  'saved_search.button': 'ENREGISTRER',
+  'saved_search.count.zero': '',
+  'saved_search.count.one': '1 recherche enregistrée',
+  'saved_search.count.other': '{{count}} recherches enregistrées',
+
+  'featured.title': 'Mentionné',
+  'featured.index': 'Liste complète des espèces',
+  'featured.history': 'Historique des inscriptions',
+  'featured.format': 'Format',
+
+  'locations.count.zero': 'Toutes les localisations',
+  'locations.count.one': '1 localisation',
+  'locations.count.other': '{{count}} localisations',
+
+  'reports.count.zero': '',
+  'reports.count.one': '1 rappport en cours de production',
+  'reports.count.other': '{{count}} rapports en cours de production',
+
+  'reports.ready.count.zero': '',
+  'reports.ready.count.one': '1 rapport prêt',
+  'reports.ready.count.other': '{{count}} rapports prêts',
+
+  'reports.failed.count.zero': '',
+  'reports.failed.count.one': 'Echec du rapport',
+  'reports.failed.count.other': 'Echec de {{count}} rapports',
+
+  'reports.failed.description': 'Vous pouvez relancer un téléchargement, ou le supprimer de la liste',
+  'reports.generating.description': 'Cela peut prendre du temps, mais vous pouvez fermer cette fenêtre et continuer de travailler à d\'autres rapports sur les Listes de contrôle CITES',
+
+  'reports.ready.title': 'Vos rapports',
+  'reports.generating.title': 'Rapports en cours de production',
+  'reports.latest.title': 'Votre rapport est en cours de production',
+
+  'splash.p1': 'La CITES (Convention sur le commerce international des espèces de faune et de flore sauvages menacées d\'extinction) est un accord international entre Etats qui vise à s'assurer que le commerce international de spécimens d'animaux ou de plantes sauvages ne menace pas la survie de ces derniers',
+  'splash.p2': 'La liste de contrôle CITES permet d\'explorer plus de 35 000 espèces animales ou végétales et de vérifier leur degré de protection',
+  'splash.button': 'Commencer l\'exploration'
 };

From 626f2218707ba8e1ddbec024a46e7db7ce305a69 Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Tue, 8 Apr 2014 14:15:00 +0200
Subject: [PATCH 28/58] fixed issue with escaping apostrophes

---
 app/javascripts/locales/fr.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascripts/locales/fr.js b/app/javascripts/locales/fr.js
index 71d000f..960f219 100644
--- a/app/javascripts/locales/fr.js
+++ b/app/javascripts/locales/fr.js
@@ -98,7 +98,7 @@ Em.I18n.locales.fr = {
   'reports.generating.title': 'Rapports en cours de production',
   'reports.latest.title': 'Votre rapport est en cours de production',
 
-  'splash.p1': 'La CITES (Convention sur le commerce international des espèces de faune et de flore sauvages menacées d\'extinction) est un accord international entre Etats qui vise à s'assurer que le commerce international de spécimens d'animaux ou de plantes sauvages ne menace pas la survie de ces derniers',
+  'splash.p1': 'La CITES (Convention sur le commerce international des espèces de faune et de flore sauvages menacées d\'extinction) est un accord international entre Etats qui vise à s\'assurer que le commerce international de spécimens d\'animaux ou de plantes sauvages ne menace pas la survie de ces derniers',
   'splash.p2': 'La liste de contrôle CITES permet d\'explorer plus de 35 000 espèces animales ou végétales et de vérifier leur degré de protection',
   'splash.button': 'Commencer l\'exploration'
 };

From 20447cac25b9e8e4c7fa8c6cff558040820eb226 Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Tue, 8 Apr 2014 14:53:24 +0200
Subject: [PATCH 29/58] pass locale to autocomplete

---
 app/javascripts/views/checklist_form.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/javascripts/views/checklist_form.js b/app/javascripts/views/checklist_form.js
index 4431fba..cd591c3 100644
--- a/app/javascripts/views/checklist_form.js
+++ b/app/javascripts/views/checklist_form.js
@@ -36,7 +36,8 @@ Checklist.SearchTextField = Em.TextField.extend({
       param_name: 'scientific_name',
       value: event.value,
       visibility: 'checklist',
-      per_page: 10
+      per_page: 10,
+      locale: Em.I18n.currentLocale
     };
 
     var url = Checklist.CONFIG.backend_url + 'taxon_concepts/autocomplete';

From 7a693656dbfe7b7f758c96b8b4d2702463b18f9f Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Thu, 10 Apr 2014 20:46:27 +0200
Subject: [PATCH 30/58] fixed passing locale to search

---
 app/javascripts/controllers/taxon_concept_controller.js | 2 +-
 app/javascripts/views/checklist_form.js                 | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/javascripts/controllers/taxon_concept_controller.js b/app/javascripts/controllers/taxon_concept_controller.js
index 09dfe14..656e6af 100644
--- a/app/javascripts/controllers/taxon_concept_controller.js
+++ b/app/javascripts/controllers/taxon_concept_controller.js
@@ -23,7 +23,7 @@ Checklist.TaxonConceptController = Ember.ArrayController.extend({
   refresh: function(params) {
     this.set('content', Checklist.store.find(
       Checklist.Index,
-      params
+      $.extend({locale: Em.I18n.currentLocale}, params)
     ));
   }
 });
diff --git a/app/javascripts/views/checklist_form.js b/app/javascripts/views/checklist_form.js
index cd591c3..4431fba 100644
--- a/app/javascripts/views/checklist_form.js
+++ b/app/javascripts/views/checklist_form.js
@@ -36,8 +36,7 @@ Checklist.SearchTextField = Em.TextField.extend({
       param_name: 'scientific_name',
       value: event.value,
       visibility: 'checklist',
-      per_page: 10,
-      locale: Em.I18n.currentLocale
+      per_page: 10
     };
 
     var url = Checklist.CONFIG.backend_url + 'taxon_concepts/autocomplete';

From 0c0e498c6e55e12424e3fc420304751d50d3770b Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Fri, 11 Apr 2014 10:59:16 +0200
Subject: [PATCH 31/58] fixed case

---
 app/javascripts/locales/es.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascripts/locales/es.js b/app/javascripts/locales/es.js
index 87cdf60..8e8c808 100644
--- a/app/javascripts/locales/es.js
+++ b/app/javascripts/locales/es.js
@@ -45,7 +45,7 @@ Em.I18n.locales.es = {
   'advanced.online_view': 'Vista en línea',
   'advanced.online_view.alphabetical': 'Alfabética',
   'advanced.online_view.taxonomic': 'Taxonómica',
-  'advanced.online_view.appendix': 'APÉNDICE',
+  'advanced.online_view.appendix': 'Apéndice',
   'advanced.display': 'MOSTRAR',
   'advanced.display.synonyms': 'Sinónimos',
   'advanced.display.author_name': 'Nombre del autor',

From b263a9c2653ac36e16d810d3647b8d1bce577234 Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Fri, 11 Apr 2014 13:33:56 +0200
Subject: [PATCH 32/58] wrap text on appendix and locations buttons

---
 .../templates/appendix_form.handlebars         | 10 ++++++----
 .../templates/location_view.handlebars         |  7 +++++--
 app/stylesheets/checklist.scss                 | 18 ++++++++++--------
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/app/javascripts/templates/appendix_form.handlebars b/app/javascripts/templates/appendix_form.handlebars
index 4dd9313..471b857 100644
--- a/app/javascripts/templates/appendix_form.handlebars
+++ b/app/javascripts/templates/appendix_form.handlebars
@@ -1,8 +1,10 @@
 <div class="appendix-holder">
-  <a class="btn">
-    {{view Checklist.AppendixBtnView
-      contentBinding="controllers.filtersController.appendicesIds"}}
-  </a>
+  <div class="btn-wrapper">
+    <a class="btn">
+      {{view Checklist.AppendixBtnView
+        contentBinding="controllers.filtersController.appendicesIds"}}
+    </a>
+  </div>
   <div class="drop">
     <div class="drop-holder">
       {{collection Checklist.AppendixFormCollectionView
diff --git a/app/javascripts/templates/location_view.handlebars b/app/javascripts/templates/location_view.handlebars
index 85375d8..f4d8d9b 100644
--- a/app/javascripts/templates/location_view.handlebars
+++ b/app/javascripts/templates/location_view.handlebars
@@ -1,6 +1,9 @@
 <div class="btn-holder">
-  <a class="btn">{{t locations.count countBinding="view.count"
-    tagName=""}}</a>
+  <div class="btn-wrapper">
+    <a class="btn">
+      {{t locations.count countBinding="view.count" tagName=""}}
+    </a>
+  </div>
   <div class="drop">
     <div class="drop-search">
       <fieldset>
diff --git a/app/stylesheets/checklist.scss b/app/stylesheets/checklist.scss
index bee69b5..014fcaf 100644
--- a/app/stylesheets/checklist.scss
+++ b/app/stylesheets/checklist.scss
@@ -1003,18 +1003,12 @@ ul.quick-links {
       display:inline-block;
       color:#fff;
       margin:4px 0;
-      line-height:24px;
-      font-size:13px;
-      vertical-align:middle;
+      line-height:12px;
+      font-size:12px;
       font-weight:bold;
       text-align:center;
       padding:5px 12px;
-      border-radius: 15px;
-      -moz-border-radius: 15px;
-      -webkit-border-radius: 15px;
-      background:#33536a;
       overflow: hidden;
-      white-space: nowrap;
 
       span{
         display:block;
@@ -1028,6 +1022,14 @@ ul.quick-links {
       background:#1d2f3d;
       text-decoration:none;
     }
+    .btn-wrapper {
+      border-radius: 15px;
+      -moz-border-radius: 15px;
+      -webkit-border-radius: 15px;
+      background:#33536a;
+      vertical-align:middle;
+      margin:4px 0;
+    }
   }
 }
 

From e4e0ace8fb41f7c6acfb2f1a99e6f406ed851dab Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Fri, 2 May 2014 11:37:26 +0100
Subject: [PATCH 33/58] upgraded colorbox

---
 app/javascripts/vendor/jquery.colorbox.js | 1008 ++++++++++++---------
 1 file changed, 578 insertions(+), 430 deletions(-)

diff --git a/app/javascripts/vendor/jquery.colorbox.js b/app/javascripts/vendor/jquery.colorbox.js
index d88bfa7..44a90ff 100644
--- a/app/javascripts/vendor/jquery.colorbox.js
+++ b/app/javascripts/vendor/jquery.colorbox.js
@@ -1,13 +1,24 @@
-// ColorBox v1.3.20.1 - jQuery lightbox plugin
-// (c) 2012 Jack Moore - jacklmoore.com
-// License: http://www.opensource.org/licenses/mit-license.php
+/*!
+	Colorbox v1.5.9 - 2014-04-25
+	jQuery lightbox and modal window plugin
+	(c) 2014 Jack Moore - http://www.jacklmoore.com/colorbox
+	license: http://www.opensource.org/licenses/mit-license.php
+*/
 (function ($, document, window) {
 	var
 	// Default settings object.
 	// See http://jacklmoore.com/colorbox for details.
 	defaults = {
+		// data sources
+		html: false,
+		photo: false,
+		iframe: false,
+		inline: false,
+
+		// behavior and appearance
 		transition: "elastic",
 		speed: 300,
+		fadeOut: 300,
 		width: false,
 		initialWidth: "600",
 		innerWidth: false,
@@ -18,17 +29,36 @@
 		maxHeight: false,
 		scalePhotos: true,
 		scrolling: true,
-		inline: false,
-		html: false,
-		iframe: false,
-		fastIframe: true,
-		photo: false,
-		href: false,
-		title: false,
-		rel: false,
 		opacity: 0.9,
 		preloading: true,
+		className: false,
+		overlayClose: true,
+		escKey: true,
+		arrowKey: true,
+		top: false,
+		bottom: false,
+		left: false,
+		right: false,
+		fixed: false,
+		data: undefined,
+		closeButton: true,
+		fastIframe: true,
+		open: false,
+		reposition: true,
+		loop: true,
+		slideshow: false,
+		slideshowAuto: true,
+		slideshowSpeed: 2500,
+		slideshowStart: "start slideshow",
+		slideshowStop: "stop slideshow",
+		photoRegex: /\.(gif|png|jp(e|g|eg)|bmp|ico|webp|jxr|svg)((#|\?).*)?$/i,
 
+		// alternate image paths for high-res displays
+		retinaImage: false,
+		retinaUrl: false,
+		retinaSuffix: '@2x.$1',
+
+		// internationalization
 		current: "image {current} of {total}",
 		previous: "previous",
 		next: "next",
@@ -36,31 +66,30 @@
 		xhrError: "This content failed to load.",
 		imgError: "This image failed to load.",
 
-		open: false,
+		// accessbility
 		returnFocus: true,
-		reposition: true,
-		loop: true,
-		slideshow: false,
-		slideshowAuto: true,
-		slideshowSpeed: 2500,
-		slideshowStart: "start slideshow",
-		slideshowStop: "stop slideshow",
+		trapFocus: true,
+
+		// callbacks
 		onOpen: false,
 		onLoad: false,
 		onComplete: false,
 		onCleanup: false,
 		onClosed: false,
-		overlayClose: true,
-		escKey: true,
-		arrowKey: true,
-		top: false,
-		bottom: false,
-		left: false,
-		right: false,
-		fixed: false,
-		data: undefined
+
+		rel: function() {
+			return this.rel;
+		},
+		href: function() {
+			// using this.href would give the absolute url, when the href may have been inteded as a selector (e.g. '#container')
+			return $(this).attr('href');
+		},
+		title: function() {
+			return this.title;
+		}
 	},
-	
+
+
 	// Abstracting the HTML and event identifiers for easy rebranding
 	colorbox = 'colorbox',
 	prefix = 'cbox',
@@ -73,11 +102,6 @@
 	event_cleanup = prefix + '_cleanup',
 	event_closed = prefix + '_closed',
 	event_purge = prefix + '_purge',
-	
-	// Special Handling for IE
-	isIE = !$.support.opacity && !$.support.style, // IE7 & IE8
-	isIE6 = isIE && !window.XMLHttpRequest, // IE6
-	event_ie6 = prefix + '_IE6',
 
 	// Cached jQuery Object Variables
 	$overlay,
@@ -100,6 +124,7 @@
 	$prev,
 	$close,
 	$groupControls,
+	$events = $('<a/>'), // $({}) would be prefered, but there is an issue with jQuery 1.4.2
 	
 	// Variables for cached values or use across multiple functions
 	settings,
@@ -107,7 +132,6 @@
 	interfaceWidth,
 	loadedHeight,
 	loadedWidth,
-	element,
 	index,
 	photo,
 	open,
@@ -116,13 +140,15 @@
 	loadingTimer,
 	publicMethod,
 	div = "div",
+	requests = 0,
+	previousCSS = {},
 	init;
 
 	// ****************
 	// HELPER FUNCTIONS
 	// ****************
 	
-	// Convience function for creating new jQuery objects
+	// Convenience function for creating new jQuery objects
 	function $tag(tag, id, css) {
 		var element = document.createElement(tag);
 
@@ -136,6 +162,44 @@
 
 		return $(element);
 	}
+	
+	// Get the window height using innerHeight when available to avoid an issue with iOS
+	// http://bugs.jquery.com/ticket/6724
+	function winheight() {
+		return window.innerHeight ? window.innerHeight : $(window).height();
+	}
+
+	function Settings(element, options) {
+		if (options !== Object(options)) {
+			options = {};
+		}
+
+		this.cache = {};
+		this.el = element;
+
+		this.value = function(key) {
+			var dataAttr;
+
+			if (this.cache[key] === undefined) {
+				dataAttr = $(this.el).attr('data-cbox-'+key);
+
+				if (dataAttr !== undefined) {
+					this.cache[key] = dataAttr;
+				} else if (options[key] !== undefined) {
+					this.cache[key] = options[key];
+				} else if (defaults[key] !== undefined) {
+					this.cache[key] = defaults[key];
+				}
+			}
+
+			return this.cache[key];
+		};
+
+		this.get = function(key) {
+			var value = this.value(key);
+			return $.isFunction(value) ? value.call(this.el, this) : value;
+		};
+	}
 
 	// Determine the next and previous members in a group.
 	function getIndex(increment) {
@@ -148,200 +212,253 @@
 
 	// Convert '%' and 'px' values to integers
 	function setSize(size, dimension) {
-		return Math.round((/%/.test(size) ? ((dimension === 'x' ? winWidth() : winHeight()) / 100) : 1) * parseInt(size, 10));
+		return Math.round((/%/.test(size) ? ((dimension === 'x' ? $window.width() : winheight()) / 100) : 1) * parseInt(size, 10));
 	}
 	
 	// Checks an href to see if it is a photo.
-	// There is a force photo option (photo: true) for hrefs that cannot be matched by this regex.
-	function isImage(url) {
-		return settings.photo || /\.(gif|png|jp(e|g|eg)|bmp|ico)((#|\?).*)?$/i.test(url);
-	}
-	
-	function winWidth() {
-		// $(window).width() is incorrect for some mobile browsers, but
-		// window.innerWidth is unsupported in IE8 and lower.
-		return window.innerWidth || $window.width();
+	// There is a force photo option (photo: true) for hrefs that cannot be matched by the regex.
+	function isImage(settings, url) {
+		return settings.get('photo') || settings.get('photoRegex').test(url);
 	}
 
-	function winHeight() {
-		return window.innerHeight || $window.height();
+	function retinaUrl(settings, url) {
+		return settings.get('retinaUrl') && window.devicePixelRatio > 1 ? url.replace(settings.get('photoRegex'), settings.get('retinaSuffix')) : url;
 	}
 
-	// Assigns function results to their respective properties
-	function makeSettings() {
-		var i,
-			data = $.data(element, colorbox);
-		
-		if (data == null) {
-			settings = $.extend({}, defaults);
-			if (console && console.log) {
-				console.log('Error: cboxElement missing settings object');
-			}
-		} else {
-			settings = $.extend({}, data);
-		}
-		
-		for (i in settings) {
-			if ($.isFunction(settings[i]) && i.slice(0, 2) !== 'on') { // checks to make sure the function isn't one of the callbacks, they will be handled at the appropriate time.
-				settings[i] = settings[i].call(element);
-			}
-		}
-		
-		settings.rel = settings.rel || element.rel || 'nofollow';
-		settings.href = settings.href || $(element).attr('href');
-		settings.title = settings.title || element.title;
-		
-		if (typeof settings.href === "string") {
-			settings.href = $.trim(settings.href);
+	function trapFocus(e) {
+		if ('contains' in $box[0] && !$box[0].contains(e.target) && e.target !== $overlay[0]) {
+			e.stopPropagation();
+			$box.focus();
 		}
 	}
 
-	function trigger(event, callback) {
-		$.event.trigger(event);
-		if (callback) {
-			callback.call(element);
+	function setClass(str) {
+		if (setClass.str !== str) {
+			$box.add($overlay).removeClass(setClass.str).addClass(str);
+			setClass.str = str;
 		}
 	}
 
-	// Slideshow functionality
-	function slideshow() {
-		var
-		timeOut,
-		className = prefix + "Slideshow_",
-		click = "click." + prefix,
-		start,
-		stop,
-		clear;
+	function getRelated(rel) {
+		index = 0;
 		
-		if (settings.slideshow && $related[1]) {
-			start = function () {
-				$slideshow
-					.text(settings.slideshowStop)
-					.unbind(click)
-					.bind(event_complete, function () {
-						if (settings.loop || $related[index + 1]) {
-							timeOut = setTimeout(publicMethod.next, settings.slideshowSpeed);
-						}
-					})
-					.bind(event_load, function () {
-						clearTimeout(timeOut);
-					})
-					.one(click + ' ' + event_cleanup, stop);
-				$box.removeClass(className + "off").addClass(className + "on");
-				timeOut = setTimeout(publicMethod.next, settings.slideshowSpeed);
-			};
-			
-			stop = function () {
-				clearTimeout(timeOut);
-				$slideshow
-					.text(settings.slideshowStart)
-					.unbind([event_complete, event_load, event_cleanup, click].join(' '))
-					.one(click, function () {
-						publicMethod.next();
-						start();
-					});
-				$box.removeClass(className + "on").addClass(className + "off");
-			};
+		if (rel && rel !== false) {
+			$related = $('.' + boxElement).filter(function () {
+				var options = $.data(this, colorbox);
+				var settings = new Settings(this, options);
+				return (settings.get('rel') === rel);
+			});
+			index = $related.index(settings.el);
 			
-			if (settings.slideshowAuto) {
-				start();
-			} else {
-				stop();
+			// Check direct calls to Colorbox.
+			if (index === -1) {
+				$related = $related.add(settings.el);
+				index = $related.length - 1;
 			}
 		} else {
-			$box.removeClass(className + "off " + className + "on");
+			$related = $(settings.el);
 		}
 	}
 
-	function launch(target) {
-		if (!closing) {
-			
-			element = target;
-			
-			makeSettings();
-			
-			$related = $(element);
-			
-			index = 0;
+	function trigger(event) {
+		// for external use
+		$(document).trigger(event);
+		// for internal use
+		$events.triggerHandler(event);
+	}
+
+	var slideshow = (function(){
+		var active,
+			className = prefix + "Slideshow_",
+			click = "click." + prefix,
+			timeOut;
+
+		function clear () {
+			clearTimeout(timeOut);
+		}
+
+		function set() {
+			if (settings.get('loop') || $related[index + 1]) {
+				clear();
+				timeOut = setTimeout(publicMethod.next, settings.get('slideshowSpeed'));
+			}
+		}
+
+		function start() {
+			$slideshow
+				.html(settings.get('slideshowStop'))
+				.unbind(click)
+				.one(click, stop);
+
+			$events
+				.bind(event_complete, set)
+				.bind(event_load, clear);
+
+			$box.removeClass(className + "off").addClass(className + "on");
+		}
+
+		function stop() {
+			clear();
 			
-			if (settings.rel !== 'nofollow') {
-				$related = $('.' + boxElement).filter(function () {
-					var data = $.data(this, colorbox),
-						relRelated;
+			$events
+				.unbind(event_complete, set)
+				.unbind(event_load, clear);
 
-					if (data) {
-						relRelated =  data.rel || this.rel;
-					}
-					
-					return (relRelated === settings.rel);
+			$slideshow
+				.html(settings.get('slideshowStart'))
+				.unbind(click)
+				.one(click, function () {
+					publicMethod.next();
+					start();
 				});
-				index = $related.index(element);
-				
-				// Check direct calls to ColorBox.
-				if (index === -1) {
-					$related = $related.add(element);
-					index = $related.length - 1;
+
+			$box.removeClass(className + "on").addClass(className + "off");
+		}
+
+		function reset() {
+			active = false;
+			$slideshow.hide();
+			clear();
+			$events
+				.unbind(event_complete, set)
+				.unbind(event_load, clear);
+			$box.removeClass(className + "off " + className + "on");
+		}
+
+		return function(){
+			if (active) {
+				if (!settings.get('slideshow')) {
+					$events.unbind(event_cleanup, reset);
+					reset();
+				}
+			} else {
+				if (settings.get('slideshow') && $related[1]) {
+					active = true;
+					$events.one(event_cleanup, reset);
+					if (settings.get('slideshowAuto')) {
+						start();
+					} else {
+						stop();
+					}
+					$slideshow.show();
 				}
 			}
+		};
+
+	}());
+
+
+	function launch(element) {
+		var options;
+
+		if (!closing) {
+
+			options = $(element).data('colorbox');
+
+			settings = new Settings(element, options);
 			
+			getRelated(settings.get('rel'));
+
 			if (!open) {
 				open = active = true; // Prevents the page-change action from queuing up if the visitor holds down the left or right keys.
+
+				setClass(settings.get('className'));
 				
-				$box.show();
-				
-				if (settings.returnFocus) {
-					$(element).blur().one(event_closed, function () {
-						$(this).focus();
-					});
-				}
-				
-				// +settings.opacity avoids a problem in IE when using non-zero-prefixed-string-values, like '.5'
-				$overlay.css({"opacity": +settings.opacity, "cursor": settings.overlayClose ? "pointer" : "auto"}).show();
+				// Show colorbox so the sizes can be calculated in older versions of jQuery
+				$box.css({visibility:'hidden', display:'block', opacity:''});
 				
-				// Opens inital empty ColorBox prior to content being loaded.
-				settings.w = setSize(settings.initialWidth, 'x');
-				settings.h = setSize(settings.initialHeight, 'y');
+				$loaded = $tag(div, 'LoadedContent', 'width:0; height:0; overflow:hidden; visibility:hidden');
+				$content.css({width:'', height:''}).append($loaded);
+
+				// Cache values needed for size calculations
+				interfaceHeight = $topBorder.height() + $bottomBorder.height() + $content.outerHeight(true) - $content.height();
+				interfaceWidth = $leftBorder.width() + $rightBorder.width() + $content.outerWidth(true) - $content.width();
+				loadedHeight = $loaded.outerHeight(true);
+				loadedWidth = $loaded.outerWidth(true);
+
+				// Opens inital empty Colorbox prior to content being loaded.
+				var initialWidth = setSize(settings.get('initialWidth'), 'x');
+				var initialHeight = setSize(settings.get('initialHeight'), 'y');
+				var maxWidth = settings.get('maxWidth');
+				var maxHeight = settings.get('maxHeight');
+
+				settings.w = (maxWidth !== false ? Math.min(initialWidth, setSize(maxWidth, 'x')) : initialWidth) - loadedWidth - interfaceWidth;
+				settings.h = (maxHeight !== false ? Math.min(initialHeight, setSize(maxHeight, 'y')) : initialHeight) - loadedHeight - interfaceHeight;
+
+				$loaded.css({width:'', height:settings.h});
 				publicMethod.position();
-				
-				if (isIE6) {
-					$window.bind('resize.' + event_ie6 + ' scroll.' + event_ie6, function () {
-						$overlay.css({width: winWidth(), height: winHeight(), top: $window.scrollTop(), left: $window.scrollLeft()});
-					}).trigger('resize.' + event_ie6);
-				}
-				
-				trigger(event_open, settings.onOpen);
-				
+
+				trigger(event_open);
+				settings.get('onOpen');
+
 				$groupControls.add($title).hide();
+
+				$box.focus();
 				
-				$close.html(settings.close).show();
+				if (settings.get('trapFocus')) {
+					// Confine focus to the modal
+					// Uses event capturing that is not supported in IE8-
+					if (document.addEventListener) {
+
+						document.addEventListener('focus', trapFocus, true);
+						
+						$events.one(event_closed, function () {
+							document.removeEventListener('focus', trapFocus, true);
+						});
+					}
+				}
+
+				// Return focus on closing
+				if (settings.get('returnFocus')) {
+					$events.one(event_closed, function () {
+						$(settings.el).focus();
+					});
+				}
 			}
+
+			$overlay.css({
+				opacity: parseFloat(settings.get('opacity')) || '',
+				cursor: settings.get('overlayClose') ? 'pointer' : '',
+				visibility: 'visible'
+			}).show();
 			
-			publicMethod.load(true);
+			if (settings.get('closeButton')) {
+				$close.html(settings.get('close')).appendTo($content);
+			} else {
+				$close.appendTo('<div/>'); // replace with .detach() when dropping jQuery < 1.4
+			}
+
+			load();
 		}
 	}
 
-	// ColorBox's markup needs to be added to the DOM prior to being called
+	// Colorbox's markup needs to be added to the DOM prior to being called
 	// so that the browser will go ahead and load the CSS background images.
 	function appendHTML() {
 		if (!$box && document.body) {
 			init = false;
-
 			$window = $(window);
-			$box = $tag(div).attr({id: colorbox, 'class': isIE ? prefix + (isIE6 ? 'IE6' : 'IE') : ''}).hide();
-			$overlay = $tag(div, "Overlay", isIE6 ? 'position:absolute' : '').hide();
-			$loadingOverlay = $tag(div, "LoadingOverlay").add($tag(div, "LoadingGraphic"));
+			$box = $tag(div).attr({
+				id: colorbox,
+				'class': $.support.opacity === false ? prefix + 'IE' : '', // class for optional IE8 & lower targeted CSS.
+				role: 'dialog',
+				tabindex: '-1'
+			}).hide();
+			$overlay = $tag(div, "Overlay").hide();
+			$loadingOverlay = $([$tag(div, "LoadingOverlay")[0],$tag(div, "LoadingGraphic")[0]]);
 			$wrap = $tag(div, "Wrapper");
 			$content = $tag(div, "Content").append(
-				$loaded = $tag(div, "LoadedContent", 'width:0; height:0; overflow:hidden'),
 				$title = $tag(div, "Title"),
 				$current = $tag(div, "Current"),
-				$next = $tag(div, "Next"),
-				$prev = $tag(div, "Previous"),
-				$slideshow = $tag(div, "Slideshow").bind(event_open, slideshow),
-				$close = $tag(div, "Close")
+				$prev = $('<button type="button"/>').attr({id:prefix+'Previous'}),
+				$next = $('<button type="button"/>').attr({id:prefix+'Next'}),
+				$slideshow = $tag('button', "Slideshow"),
+				$loadingOverlay
 			);
+
+			$close = $('<button type="button"/>').attr({id:prefix+'Close'});
 			
-			$wrap.append( // The 3x3 Grid that makes up ColorBox
+			$wrap.append( // The 3x3 Grid that makes up Colorbox
 				$tag(div).append(
 					$tag(div, "TopLeft"),
 					$topBorder = $tag(div, "TopCenter"),
@@ -359,7 +476,7 @@
 				)
 			).find('div div').css({'float': 'left'});
 			
-			$loadingBay = $tag(div, false, 'position:absolute; width:9999px; visibility:hidden; display:none');
+			$loadingBay = $tag(div, false, 'position:absolute; width:9999px; visibility:hidden; display:none; max-width:none;');
 			
 			$groupControls = $next.add($prev).add($current).add($slideshow);
 
@@ -367,21 +484,21 @@
 		}
 	}
 
-	// Add ColorBox's event bindings
+	// Add Colorbox's event bindings
 	function addBindings() {
+		function clickHandler(e) {
+			// ignore non-left-mouse-clicks and clicks modified with ctrl / command, shift, or alt.
+			// See: http://jacklmoore.com/notes/click-events/
+			if (!(e.which > 1 || e.shiftKey || e.altKey || e.metaKey || e.ctrlKey)) {
+				e.preventDefault();
+				launch(this);
+			}
+		}
+
 		if ($box) {
 			if (!init) {
 				init = true;
 
-				// Cache values needed for size calculations
-				interfaceHeight = $topBorder.height() + $bottomBorder.height() + $content.outerHeight(true) - $content.height();//Subtraction needed for IE6
-				interfaceWidth = $leftBorder.width() + $rightBorder.width() + $content.outerWidth(true) - $content.width();
-				loadedHeight = $loaded.outerHeight(true);
-				loadedWidth = $loaded.outerWidth(true);
-				
-				// Setting padding to remove the need to do size conversions during the animation step.
-				$box.css({"padding-bottom": interfaceHeight, "padding-right": interfaceWidth});
-
 				// Anonymous functions here keep the public method from being cached, thereby allowing them to be redefined on the fly.
 				$next.click(function () {
 					publicMethod.next();
@@ -393,7 +510,7 @@
 					publicMethod.close();
 				});
 				$overlay.click(function () {
-					if (settings.overlayClose) {
+					if (settings.get('overlayClose')) {
 						publicMethod.close();
 					}
 				});
@@ -401,11 +518,11 @@
 				// Key Bindings
 				$(document).bind('keydown.' + prefix, function (e) {
 					var key = e.keyCode;
-					if (open && settings.escKey && key === 27) {
+					if (open && settings.get('escKey') && key === 27) {
 						e.preventDefault();
 						publicMethod.close();
 					}
-					if (open && settings.arrowKey && $related[1]) {
+					if (open && settings.get('arrowKey') && $related[1] && !e.altKey) {
 						if (key === 37) {
 							e.preventDefault();
 							$prev.click();
@@ -416,21 +533,22 @@
 					}
 				});
 
-				$('.' + boxElement, document).live('click', function (e) {
-					// ignore non-left-mouse-clicks and clicks modified with ctrl / command, shift, or alt.
-					// See: http://jacklmoore.com/notes/click-events/
-					if (!(e.which > 1 || e.shiftKey || e.altKey || e.metaKey)) {
-						e.preventDefault();
-						launch(this);
-					}
-				});
+				if ($.isFunction($.fn.on)) {
+					// For jQuery 1.7+
+					$(document).on('click.'+prefix, '.'+boxElement, clickHandler);
+				} else {
+					// For jQuery 1.3.x -> 1.6.x
+					// This code is never reached in jQuery 1.9, so do not contact me about 'live' being removed.
+					// This is not here for jQuery 1.9, it's here for legacy users.
+					$('.'+boxElement).live('click.'+prefix, clickHandler);
+				}
 			}
 			return true;
 		}
 		return false;
 	}
 
-	// Don't do anything if ColorBox already exists.
+	// Don't do anything if Colorbox already exists.
 	if ($.colorbox) {
 		return;
 	}
@@ -441,41 +559,49 @@
 
 	// ****************
 	// PUBLIC FUNCTIONS
-	// Usage format: $.fn.colorbox.close();
-	// Usage from within an iframe: parent.$.fn.colorbox.close();
+	// Usage format: $.colorbox.close();
+	// Usage from within an iframe: parent.jQuery.colorbox.close();
 	// ****************
 	
 	publicMethod = $.fn[colorbox] = $[colorbox] = function (options, callback) {
-		var $this = this;
-		
+		var settings;
+		var $obj = this;
+
 		options = options || {};
+
+		if ($.isFunction($obj)) { // assume a call to $.colorbox
+			$obj = $('<a/>');
+			options.open = true;
+		} else if (!$obj[0]) { // colorbox being applied to empty collection
+			return $obj;
+		}
+
+
+		if (!$obj[0]) { // colorbox being applied to empty collection
+			return $obj;
+		}
 		
 		appendHTML();
 
 		if (addBindings()) {
-			if (!$this[0]) {
-				if ($this.selector) { // if a selector was given and it didn't match any elements, go ahead and exit.
-					return $this;
-				}
-				// if no selector was given (ie. $.colorbox()), create a temporary element to work with
-				$this = $('<a/>');
-				options.open = true; // assume an immediate open
-			}
-			
+
 			if (callback) {
 				options.onComplete = callback;
 			}
-			
-			$this.each(function () {
-				$.data(this, colorbox, $.extend({}, $.data(this, colorbox) || defaults, options));
+
+			$obj.each(function () {
+				var old = $.data(this, colorbox) || {};
+				$.data(this, colorbox, $.extend(old, options));
 			}).addClass(boxElement);
+
+			settings = new Settings($obj[0], options);
 			
-			if (($.isFunction(options.open) && options.open.call($this)) || options.open) {
-				launch($this[0]);
+			if (settings.get('open')) {
+				launch($obj[0]);
 			}
 		}
 		
-		return $this;
+		return $obj;
 	};
 
 	publicMethod.position = function (speed, loadedCallback) {
@@ -495,7 +621,7 @@
 		scrollTop = $window.scrollTop();
 		scrollLeft = $window.scrollLeft();
 
-		if (settings.fixed && !isIE6) {
+		if (settings.get('fixed')) {
 			offset.top -= scrollTop;
 			offset.left -= scrollLeft;
 			$box.css({position: 'fixed'});
@@ -506,45 +632,58 @@
 		}
 
 		// keeps the top and left positions within the browser's viewport.
-		if (settings.right !== false) {
-			left += Math.max(winWidth() - settings.w - loadedWidth - interfaceWidth - setSize(settings.right, 'x'), 0);
-		} else if (settings.left !== false) {
-			left += setSize(settings.left, 'x');
+		if (settings.get('right') !== false) {
+			left += Math.max($window.width() - settings.w - loadedWidth - interfaceWidth - setSize(settings.get('right'), 'x'), 0);
+		} else if (settings.get('left') !== false) {
+			left += setSize(settings.get('left'), 'x');
 		} else {
-			left += Math.round(Math.max(winWidth() - settings.w - loadedWidth - interfaceWidth, 0) / 2);
+			left += Math.round(Math.max($window.width() - settings.w - loadedWidth - interfaceWidth, 0) / 2);
 		}
 		
-		if (settings.bottom !== false) {
-			top += Math.max(winHeight() - settings.h - loadedHeight - interfaceHeight - setSize(settings.bottom, 'y'), 0);
-		} else if (settings.top !== false) {
-			top += setSize(settings.top, 'y');
+		if (settings.get('bottom') !== false) {
+			top += Math.max(winheight() - settings.h - loadedHeight - interfaceHeight - setSize(settings.get('bottom'), 'y'), 0);
+		} else if (settings.get('top') !== false) {
+			top += setSize(settings.get('top'), 'y');
 		} else {
-			top += Math.round(Math.max(winHeight() - settings.h - loadedHeight - interfaceHeight, 0) / 2);
+			top += Math.round(Math.max(winheight() - settings.h - loadedHeight - interfaceHeight, 0) / 2);
 		}
 
-		$box.css({top: offset.top, left: offset.left});
-
-		// setting the speed to 0 to reduce the delay between same-sized content.
-		speed = ($box.width() === settings.w + loadedWidth && $box.height() === settings.h + loadedHeight) ? 0 : speed || 0;
+		$box.css({top: offset.top, left: offset.left, visibility:'visible'});
 		
 		// this gives the wrapper plenty of breathing room so it's floated contents can move around smoothly,
 		// but it has to be shrank down around the size of div#colorbox when it's done.  If not,
 		// it can invoke an obscure IE bug when using iframes.
 		$wrap[0].style.width = $wrap[0].style.height = "9999px";
 		
-		function modalDimensions(that) {
-			$topBorder[0].style.width = $bottomBorder[0].style.width = $content[0].style.width = that.style.width;
-			$content[0].style.height = $leftBorder[0].style.height = $rightBorder[0].style.height = that.style.height;
+		function modalDimensions() {
+			$topBorder[0].style.width = $bottomBorder[0].style.width = $content[0].style.width = (parseInt($box[0].style.width,10) - interfaceWidth)+'px';
+			$content[0].style.height = $leftBorder[0].style.height = $rightBorder[0].style.height = (parseInt($box[0].style.height,10) - interfaceHeight)+'px';
 		}
 
-		css = {width: settings.w + loadedWidth, height: settings.h + loadedHeight, top: top, left: left};
-		if(speed===0){ // temporary workaround to side-step jQuery-UI 1.8 bug (http://bugs.jquery.com/ticket/12273)
+		css = {width: settings.w + loadedWidth + interfaceWidth, height: settings.h + loadedHeight + interfaceHeight, top: top, left: left};
+
+		// setting the speed to 0 if the content hasn't changed size or position
+		if (speed) {
+			var tempSpeed = 0;
+			$.each(css, function(i){
+				if (css[i] !== previousCSS[i]) {
+					tempSpeed = speed;
+					return;
+				}
+			});
+			speed = tempSpeed;
+		}
+
+		previousCSS = css;
+
+		if (!speed) {
 			$box.css(css);
 		}
+
 		$box.dequeue().animate(css, {
-			duration: speed,
+			duration: speed || 0,
 			complete: function () {
-				modalDimensions(this);
+				modalDimensions();
 				
 				active = false;
 				
@@ -552,7 +691,7 @@
 				$wrap[0].style.width = (settings.w + loadedWidth + interfaceWidth) + "px";
 				$wrap[0].style.height = (settings.h + loadedHeight + interfaceHeight) + "px";
 				
-				if (settings.reposition) {
+				if (settings.get('reposition')) {
 					setTimeout(function () {  // small delay before binding onresize due to an IE8 bug.
 						$window.bind('resize.' + prefix, publicMethod.position);
 					}, 1);
@@ -562,37 +701,47 @@
 					loadedCallback();
 				}
 			},
-			step: function () {
-				modalDimensions(this);
-			}
+			step: modalDimensions
 		});
 	};
 
 	publicMethod.resize = function (options) {
+		var scrolltop;
+		
 		if (open) {
 			options = options || {};
 			
 			if (options.width) {
 				settings.w = setSize(options.width, 'x') - loadedWidth - interfaceWidth;
 			}
+
 			if (options.innerWidth) {
 				settings.w = setSize(options.innerWidth, 'x');
 			}
+
 			$loaded.css({width: settings.w});
 			
 			if (options.height) {
 				settings.h = setSize(options.height, 'y') - loadedHeight - interfaceHeight;
 			}
+
 			if (options.innerHeight) {
 				settings.h = setSize(options.innerHeight, 'y');
 			}
+
 			if (!options.innerHeight && !options.height) {
+				scrolltop = $loaded.scrollTop();
 				$loaded.css({height: "auto"});
 				settings.h = $loaded.height();
 			}
+
 			$loaded.css({height: settings.h});
+
+			if(scrolltop) {
+				$loaded.scrollTop(scrolltop);
+			}
 			
-			publicMethod.position(settings.transition === "none" ? 0 : settings.speed);
+			publicMethod.position(settings.get('transition') === "none" ? 0 : settings.get('speed'));
 		}
 	};
 
@@ -601,9 +750,10 @@
 			return;
 		}
 		
-		var callback, speed = settings.transition === "none" ? 0 : settings.speed;
-		
+		var callback, speed = settings.get('transition') === "none" ? 0 : settings.get('speed');
+
 		$loaded.remove();
+
 		$loaded = $tag(div, 'LoadedContent').append(object);
 		
 		function getWidth() {
@@ -619,139 +769,117 @@
 		
 		$loaded.hide()
 		.appendTo($loadingBay.show())// content has to be appended to the DOM for accurate size calculations.
-		.css({width: getWidth(), overflow: settings.scrolling ? 'auto' : 'hidden'})
+		.css({width: getWidth(), overflow: settings.get('scrolling') ? 'auto' : 'hidden'})
 		.css({height: getHeight()})// sets the height independently from the width in case the new width influences the value of height.
 		.prependTo($content);
 		
 		$loadingBay.hide();
 		
 		// floating the IMG removes the bottom line-height and fixed a problem where IE miscalculates the width of the parent element as 100% of the document width.
-		//$(photo).css({'float': 'none', marginLeft: 'auto', marginRight: 'auto'});
 		
 		$(photo).css({'float': 'none'});
-		
-		// Hides SELECT elements in IE6 because they would otherwise sit on top of the overlay.
-		if (isIE6) {
-			$('select').not($box.find('select')).filter(function () {
-				return this.style.visibility !== 'hidden';
-			}).css({'visibility': 'hidden'}).one(event_cleanup, function () {
-				this.style.visibility = 'inherit';
-			});
-		}
-		
+
+		setClass(settings.get('className'));
+
 		callback = function () {
-			var preload,
-				i,
-				total = $related.length,
+			var total = $related.length,
 				iframe,
-				frameBorder = 'frameBorder',
-				allowTransparency = 'allowTransparency',
-				complete,
-				src,
-				img,
-				data;
+				complete;
 			
 			if (!open) {
 				return;
 			}
 			
-			function removeFilter() {
-				if (isIE) {
+			function removeFilter() { // Needed for IE8 in versions of jQuery prior to 1.7.2
+				if ($.support.opacity === false) {
 					$box[0].style.removeAttribute('filter');
 				}
 			}
 			
 			complete = function () {
 				clearTimeout(loadingTimer);
-				// Detaching forces Andriod stock browser to redraw the area underneat the loading overlay.  Hiding alone isn't enough.
-				$loadingOverlay.detach().hide();
-				trigger(event_complete, settings.onComplete);
+				$loadingOverlay.hide();
+				trigger(event_complete);
+				settings.get('onComplete');
 			};
+
 			
-			if (isIE) {
-				//This fadeIn helps the bicubic resampling to kick-in.
-				if (photo) {
-					$loaded.fadeIn(100);
-				}
-			}
-			
-			$title.html(settings.title).add($loaded).show();
+			$title.html(settings.get('title')).show();
+			$loaded.show();
 			
 			if (total > 1) { // handle grouping
-				if (typeof settings.current === "string") {
-					$current.html(settings.current.replace('{current}', index + 1).replace('{total}', total)).show();
+				if (typeof settings.get('current') === "string") {
+					$current.html(settings.get('current').replace('{current}', index + 1).replace('{total}', total)).show();
 				}
 				
-				$next[(settings.loop || index < total - 1) ? "show" : "hide"]().html(settings.next);
-				$prev[(settings.loop || index) ? "show" : "hide"]().html(settings.previous);
+				$next[(settings.get('loop') || index < total - 1) ? "show" : "hide"]().html(settings.get('next'));
+				$prev[(settings.get('loop') || index) ? "show" : "hide"]().html(settings.get('previous'));
 				
-				if (settings.slideshow) {
-					$slideshow.show();
-				}
+				slideshow();
 				
 				// Preloads images within a rel group
-				if (settings.preloading) {
-					preload = [
-						getIndex(-1),
-						getIndex(1)
-					];
-					while (i = $related[preload.pop()]) {
-						data = $.data(i, colorbox);
-						
-						if (data && data.href) {
-							src = data.href;
-							if ($.isFunction(src)) {
-								src = src.call(i);
-							}
-						} else {
-							src = i.href;
-						}
+				if (settings.get('preloading')) {
+					$.each([getIndex(-1), getIndex(1)], function(){
+						var img,
+							i = $related[this],
+							settings = new Settings(i, $.data(i, colorbox)),
+							src = settings.get('href');
 
-						if (isImage(src)) {
-							img = new Image();
+						if (src && isImage(settings, src)) {
+							src = retinaUrl(settings, src);
+							img = document.createElement('img');
 							img.src = src;
 						}
-					}
+					});
 				}
 			} else {
 				$groupControls.hide();
 			}
 			
-			if (settings.iframe) {
-				iframe = $tag('iframe')[0];
+			if (settings.get('iframe')) {
+				iframe = document.createElement('iframe');
 				
-				if (frameBorder in iframe) {
-					iframe[frameBorder] = 0;
-				}
-				if (allowTransparency in iframe) {
-					iframe[allowTransparency] = "true";
+				if ('frameBorder' in iframe) {
+					iframe.frameBorder = 0;
 				}
-				// give the iframe a unique name to prevent caching
-				iframe.name = prefix + (+new Date());
-				if (settings.fastIframe) {
-					complete();
-				} else {
-					$(iframe).one('load', complete);
+				
+				if ('allowTransparency' in iframe) {
+					iframe.allowTransparency = "true";
 				}
-				iframe.src = settings.href;
-				if (!settings.scrolling) {
+
+				if (!settings.get('scrolling')) {
 					iframe.scrolling = "no";
 				}
-				$(iframe).addClass(prefix + 'Iframe').appendTo($loaded).one(event_purge, function () {
+				
+				$(iframe)
+					.attr({
+						src: settings.get('href'),
+						name: (new Date()).getTime(), // give the iframe a unique name to prevent caching
+						'class': prefix + 'Iframe',
+						allowFullScreen : true // allow HTML5 video to go fullscreen
+					})
+					.one('load', complete)
+					.appendTo($loaded);
+				
+				$events.one(event_purge, function () {
 					iframe.src = "//about:blank";
 				});
+
+				if (settings.get('fastIframe')) {
+					$(iframe).trigger('load');
+				}
 			} else {
 				complete();
 			}
 			
-			if (settings.transition === 'fade') {
+			if (settings.get('transition') === 'fade') {
 				$box.fadeTo(speed, 1, removeFilter);
 			} else {
 				removeFilter();
 			}
 		};
 		
-		if (settings.transition === 'fade') {
+		if (settings.get('transition') === 'fade') {
 			$box.fadeTo(speed, 0, function () {
 				publicMethod.position(0, callback);
 			});
@@ -760,30 +888,24 @@
 		}
 	};
 
-	publicMethod.load = function (launched) {
-		var href, setResize, prep = publicMethod.prep;
+	function load () {
+		var href, setResize, prep = publicMethod.prep, $inline, request = ++requests;
 		
 		active = true;
 		
 		photo = false;
 		
-		element = $related[index];
-		
-		if (!launched) {
-			makeSettings();
-		}
-		
 		trigger(event_purge);
+		trigger(event_load);
+		settings.get('onLoad');
 		
-		trigger(event_load, settings.onLoad);
+		settings.h = settings.get('height') ?
+				setSize(settings.get('height'), 'y') - loadedHeight - interfaceHeight :
+				settings.get('innerHeight') && setSize(settings.get('innerHeight'), 'y');
 		
-		settings.h = settings.height ?
-				setSize(settings.height, 'y') - loadedHeight - interfaceHeight :
-				settings.innerHeight && setSize(settings.innerHeight, 'y');
-		
-		settings.w = settings.width ?
-				setSize(settings.width, 'x') - loadedWidth - interfaceWidth :
-				settings.innerWidth && setSize(settings.innerWidth, 'x');
+		settings.w = settings.get('width') ?
+				setSize(settings.get('width'), 'x') - loadedWidth - interfaceWidth :
+				settings.get('innerWidth') && setSize(settings.get('innerWidth'), 'x');
 		
 		// Sets the minimum dimensions for use in image scaling
 		settings.mw = settings.w;
@@ -791,152 +913,178 @@
 		
 		// Re-evaluate the minimum width and height based on maxWidth and maxHeight values.
 		// If the width or height exceed the maxWidth or maxHeight, use the maximum values instead.
-		if (settings.maxWidth) {
-			settings.mw = setSize(settings.maxWidth, 'x') - loadedWidth - interfaceWidth;
+		if (settings.get('maxWidth')) {
+			settings.mw = setSize(settings.get('maxWidth'), 'x') - loadedWidth - interfaceWidth;
 			settings.mw = settings.w && settings.w < settings.mw ? settings.w : settings.mw;
 		}
-		if (settings.maxHeight) {
-			settings.mh = setSize(settings.maxHeight, 'y') - loadedHeight - interfaceHeight;
+		if (settings.get('maxHeight')) {
+			settings.mh = setSize(settings.get('maxHeight'), 'y') - loadedHeight - interfaceHeight;
 			settings.mh = settings.h && settings.h < settings.mh ? settings.h : settings.mh;
 		}
 		
-		href = settings.href;
+		href = settings.get('href');
 		
 		loadingTimer = setTimeout(function () {
-			$loadingOverlay.show().appendTo($content);
+			$loadingOverlay.show();
 		}, 100);
 		
-		if (settings.inline) {
+		if (settings.get('inline')) {
+			var $target = $(href);
 			// Inserts an empty placeholder where inline content is being pulled from.
-			// An event is bound to put inline content back when ColorBox closes or loads new content.
-			$tag(div).hide().insertBefore($(href)[0]).one(event_purge, function () {
-				$(this).replaceWith($loaded.children());
+			// An event is bound to put inline content back when Colorbox closes or loads new content.
+			$inline = $('<div>').hide().insertBefore($target);
+
+			$events.one(event_purge, function () {
+				$inline.replaceWith($target);
 			});
-			prep($(href));
-		} else if (settings.iframe) {
+
+			prep($target);
+		} else if (settings.get('iframe')) {
 			// IFrame element won't be added to the DOM until it is ready to be displayed,
 			// to avoid problems with DOM-ready JS that might be trying to run in that iframe.
 			prep(" ");
-		} else if (settings.html) {
-			prep(settings.html);
-		} else if (isImage(href)) {
-			$(photo = new Image())
+		} else if (settings.get('html')) {
+			prep(settings.get('html'));
+		} else if (isImage(settings, href)) {
+
+			href = retinaUrl(settings, href);
+
+			photo = new Image();
+
+			$(photo)
 			.addClass(prefix + 'Photo')
-			.error(function () {
-				settings.title = false;
-				prep($tag(div, 'Error').html(settings.imgError));
+			.bind('error',function () {
+				prep($tag(div, 'Error').html(settings.get('imgError')));
 			})
-			.load(function () {
-				var percent;
-				photo.onload = null; //stops animated gifs from firing the onload repeatedly.
-				
-				if (settings.scalePhotos) {
-					setResize = function () {
-						photo.height -= photo.height * percent;
-						photo.width -= photo.width * percent;
-					};
-					if (settings.mw && photo.width > settings.mw) {
-						percent = (photo.width - settings.mw) / photo.width;
-						setResize();
+			.one('load', function () {
+				if (request !== requests) {
+					return;
+				}
+
+				// A small pause because some browsers will occassionaly report a 
+				// img.width and img.height of zero immediately after the img.onload fires
+				setTimeout(function(){
+					var percent;
+
+					$.each(['alt', 'longdesc', 'aria-describedby'], function(i,val){
+						var attr = $(settings.el).attr(val) || $(settings.el).attr('data-'+val);
+						if (attr) {
+							photo.setAttribute(val, attr);
+						}
+					});
+
+					if (settings.get('retinaImage') && window.devicePixelRatio > 1) {
+						photo.height = photo.height / window.devicePixelRatio;
+						photo.width = photo.width / window.devicePixelRatio;
 					}
-					if (settings.mh && photo.height > settings.mh) {
-						percent = (photo.height - settings.mh) / photo.height;
-						setResize();
+
+					if (settings.get('scalePhotos')) {
+						setResize = function () {
+							photo.height -= photo.height * percent;
+							photo.width -= photo.width * percent;
+						};
+						if (settings.mw && photo.width > settings.mw) {
+							percent = (photo.width - settings.mw) / photo.width;
+							setResize();
+						}
+						if (settings.mh && photo.height > settings.mh) {
+							percent = (photo.height - settings.mh) / photo.height;
+							setResize();
+						}
 					}
-				}
-				
-				if (settings.h) {
-					photo.style.marginTop = Math.max(settings.h - photo.height, 0) / 2 + 'px';
-				}
-				
-				if ($related[1] && (settings.loop || $related[index + 1])) {
-					photo.style.cursor = 'pointer';
-					photo.onclick = function () {
-						publicMethod.next();
-					};
-				}
-				
-				if (isIE) {
-					photo.style.msInterpolationMode = 'bicubic';
-				}
-				
-				setTimeout(function () { // A pause because Chrome will sometimes report a 0 by 0 size otherwise.
+					
+					if (settings.h) {
+						photo.style.marginTop = Math.max(settings.mh - photo.height, 0) / 2 + 'px';
+					}
+					
+					if ($related[1] && (settings.get('loop') || $related[index + 1])) {
+						photo.style.cursor = 'pointer';
+						photo.onclick = function () {
+							publicMethod.next();
+						};
+					}
+
+					photo.style.width = photo.width + 'px';
+					photo.style.height = photo.height + 'px';
 					prep(photo);
 				}, 1);
 			});
 			
-			setTimeout(function () { // A pause because Opera 10.6+ will sometimes not run the onload function otherwise.
-				photo.src = href;
-			}, 1);
+			photo.src = href;
+
 		} else if (href) {
-			$loadingBay.load(href, settings.data, function (data, status, xhr) {
-				prep(status === 'error' ? $tag(div, 'Error').html(settings.xhrError) : $(this).contents());
+			$loadingBay.load(href, settings.get('data'), function (data, status) {
+				if (request === requests) {
+					prep(status === 'error' ? $tag(div, 'Error').html(settings.get('xhrError')) : $(this).contents());
+				}
 			});
 		}
-	};
+	}
 		
 	// Navigates to the next page/image in a set.
 	publicMethod.next = function () {
-		if (!active && $related[1] && (settings.loop || $related[index + 1])) {
+		if (!active && $related[1] && (settings.get('loop') || $related[index + 1])) {
 			index = getIndex(1);
-			publicMethod.load();
+			launch($related[index]);
 		}
 	};
 	
 	publicMethod.prev = function () {
-		if (!active && $related[1] && (settings.loop || index)) {
+		if (!active && $related[1] && (settings.get('loop') || index)) {
 			index = getIndex(-1);
-			publicMethod.load();
+			launch($related[index]);
 		}
 	};
 
-	// Note: to use this within an iframe use the following format: parent.$.fn.colorbox.close();
+	// Note: to use this within an iframe use the following format: parent.jQuery.colorbox.close();
 	publicMethod.close = function () {
 		if (open && !closing) {
 			
 			closing = true;
-			
 			open = false;
+			trigger(event_cleanup);
+			settings.get('onCleanup');
+			$window.unbind('.' + prefix);
+			$overlay.fadeTo(settings.get('fadeOut') || 0, 0);
 			
-			trigger(event_cleanup, settings.onCleanup);
-			
-			$window.unbind('.' + prefix + ' .' + event_ie6);
-			
-			$overlay.fadeTo(200, 0);
-			
-			$box.stop().fadeTo(300, 0, function () {
-			
-				$box.add($overlay).css({'opacity': 1, cursor: 'auto'}).hide();
-				
+			$box.stop().fadeTo(settings.get('fadeOut') || 0, 0, function () {
+				$box.hide();
+				$overlay.hide();
 				trigger(event_purge);
-				
 				$loaded.remove();
 				
 				setTimeout(function () {
 					closing = false;
-					trigger(event_closed, settings.onClosed);
+					trigger(event_closed);
+					settings.get('onClosed');
 				}, 1);
 			});
 		}
 	};
 
-	// Removes changes ColorBox made to the document, but does not remove the plugin
-	// from jQuery.
+	// Removes changes Colorbox made to the document, but does not remove the plugin.
 	publicMethod.remove = function () {
-		$([]).add($box).add($overlay).remove();
+		if (!$box) { return; }
+
+		$box.stop();
+		$.colorbox.close();
+		$box.stop().remove();
+		$overlay.remove();
+		closing = false;
 		$box = null;
 		$('.' + boxElement)
 			.removeData(colorbox)
-			.removeClass(boxElement)
-			.die();
+			.removeClass(boxElement);
+
+		$(document).unbind('click.'+prefix);
 	};
 
-	// A method for fetching the current element ColorBox is referencing.
+	// A method for fetching the current element Colorbox is referencing.
 	// returns a jQuery object.
 	publicMethod.element = function () {
-		return $(element);
+		return $(settings.el);
 	};
 
 	publicMethod.settings = defaults;
 
-}(jQuery, document, this));
\ No newline at end of file
+}(jQuery, document, window));
\ No newline at end of file

From 80ce56fe0f5644609ca7ada4ea7c52967b618dd5 Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Fri, 2 May 2014 11:37:46 +0100
Subject: [PATCH 34/58] add translation links with colorbox-aware handlers to
 splash screen

---
 app/javascripts/routers/router.js             |  2 +-
 .../templates/main_view.handlebars            |  5 ++
 app/javascripts/views/main_view.js            | 59 +++++++++++--------
 app/stylesheets/_fancybox.scss                | 29 +++++++--
 4 files changed, 65 insertions(+), 30 deletions(-)

diff --git a/app/javascripts/routers/router.js b/app/javascripts/routers/router.js
index d0a9fda..5f11a21 100644
--- a/app/javascripts/routers/router.js
+++ b/app/javascripts/routers/router.js
@@ -19,7 +19,7 @@ Checklist.Router = Ember.Router.extend({
           locale = 'en';
         }
         Em.I18n.translations = Em.I18n.locales[locale];
-        Em.I18n.currentLocale = locale;
+        Ember.set('Em.I18n.currentLocale',  locale);
         console.log('CURRENT LOCALE IS:', Em.I18n.currentLocale);
       },
 
diff --git a/app/javascripts/templates/main_view.handlebars b/app/javascripts/templates/main_view.handlebars
index cd7fc96..238507d 100644
--- a/app/javascripts/templates/main_view.handlebars
+++ b/app/javascripts/templates/main_view.handlebars
@@ -48,6 +48,11 @@
         <div class="appendix-ind-2"></div>
         <div class="appendix-ind-3"></div>
       </div>
+      <div class="locale-selector">
+        <a href="#" {{action doLocaleEN target="view"}}>English</a>
+        <a href="#" {{action doLocaleES target="view"}}>Español</a>
+        <a href="#" {{action doLocaleFR target="view"}}>Français</a>
+      </div>
     </div>
   </div>
 </div>
diff --git a/app/javascripts/views/main_view.js b/app/javascripts/views/main_view.js
index 27b1ef2..57f469b 100644
--- a/app/javascripts/views/main_view.js
+++ b/app/javascripts/views/main_view.js
@@ -4,39 +4,50 @@ Checklist.MainView = Ember.View.extend({
 
   classNames: ['main'],
 
+  landingColorboxConfig: {
+    inline: true,
+    transition: 'fade',
+    close: 'x',
+    opacity: 0.8,
+    fixed: true,
+    maxWidth: 675,
+    innerWidth: 675,
+    open: true,
+    className: 'landing',
+    onClosed: function(event) {
+      $.cookie("Checklist.CONFIG.visited", true);
+    }
+  },
+
   didInsertElement: function() {
     var target = document.getElementById('loading');
     var spinner = new Spinner(Checklist.CONFIG.spinner).spin(target);
 
     if (!$.cookie("Checklist.CONFIG.visited")) {
-      var landing_colorbox_config = {
-          inline: true,
-          transition: 'fade',
-          close: 'x',
-          opacity: 0.8,
-          fixed: true,
-          maxWidth: 675,
-          innerWidth: 675,
-          open: true,
-          onOpen: function(event) {
-            // A truly awful hack to ensure that the close button is
-            // aligned properly. Without modifying colorbox, there's no
-            // way to make the CSS for the close button for this box
-            // distinct from the css for the close button for other boxes
-            // of different widths.
-            $('#cboxClose').css({right: '30px'});
-          },
-          onClosed: function(event) {
-            $.cookie("Checklist.CONFIG.visited", true);
-            $('#cboxClose').css({right: '10px'});
-          }
-        };
-
-      $('#landing-btn').colorbox(landing_colorbox_config);
+      $('#landing-btn').colorbox(this.get('landingColorboxConfig'));
     }
   },
 
   closeLandingBox: function(event) {
     $.colorbox.close();
+  },
+
+  doLocaleEN: function(event) {
+    $.colorbox.remove();
+    Checklist.router.transitionTo('home.index', {locale: 'en'});
+    $('#landing-btn').colorbox(this.get('landingColorboxConfig'));
+  },
+
+  doLocaleES: function(event) {
+    $.colorbox.remove();
+    Checklist.router.transitionTo('home.index', {locale: 'es'});
+    $('#landing-btn').colorbox(this.get('landingColorboxConfig'));
+  },
+
+  doLocaleFR: function(event) {
+    $.colorbox.remove();
+    Checklist.router.transitionTo('home.index', {locale: 'fr'});
+    $('#landing-btn').colorbox(this.get('landingColorboxConfig'));
   }
+
 });
diff --git a/app/stylesheets/_fancybox.scss b/app/stylesheets/_fancybox.scss
index 94bb176..f8367d2 100644
--- a/app/stylesheets/_fancybox.scss
+++ b/app/stylesheets/_fancybox.scss
@@ -285,11 +285,22 @@
       background-image: url(/images/landing-screenshot.png);
       height: 256px;
       position: absolute;
-      top: 40px;
+      top: 70px;
       right: 25px;
       box-shadow: 0px 2px 5px 0px #999;
     }
 
+    .locale-selector {
+      font-size: 13px;
+      margin-right: 20px;
+      line-height: 15px;
+      vertical-align: baseline;
+      float: right;
+      position: absolute;
+      top: 400px;
+      right: 25px;
+    }
+
     .appendix-ind-1 {
       width: 65px;
       height: 65px;
@@ -385,19 +396,27 @@
 #cboxPrevious:hover{background-position:0px -25px;}
 #cboxNext{background-position:-25px 0px; right:22px;}
 #cboxNext:hover{background-position:-25px -25px;}
+
 #cboxClose {
   background: #33536A;
   @include vendor-prefix(border-radius, 50%);
   color: #fff;
-  text-indent: 8px;
-  line-height: 18px;
-
-  position: absolute;
+  outline-color: #33536A;
+  font-size: 12px;
+  line-height: 12px;
+  text-indent: 0;
   right: 10px;
   top: -10px;
 }
+
 .cboxSlideshow_on #cboxPrevious, .cboxSlideshow_off #cboxPrevious{right:66px;}
 .cboxSlideshow_on #cboxSlideshow{background-position:-75px -25px; right:44px;}
 .cboxSlideshow_on #cboxSlideshow:hover{background-position:-100px -25px;}
 .cboxSlideshow_off #cboxSlideshow{background-position:-100px 0px; right:44px;}
 .cboxSlideshow_off #cboxSlideshow:hover{background-position:-75px -25px;}
+.landing {
+  #cboxClose {
+    right: 30px;
+    top: -10px;
+  }
+}

From e53e2e6f0e0edc257eeed9e42610db42250ab72e Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Thu, 8 May 2014 11:47:13 +0100
Subject: [PATCH 35/58] hopefully fixes the close button

---
 app/javascripts/views/main_view.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/javascripts/views/main_view.js b/app/javascripts/views/main_view.js
index 57f469b..c023c11 100644
--- a/app/javascripts/views/main_view.js
+++ b/app/javascripts/views/main_view.js
@@ -33,19 +33,16 @@ Checklist.MainView = Ember.View.extend({
   },
 
   doLocaleEN: function(event) {
-    $.colorbox.remove();
     Checklist.router.transitionTo('home.index', {locale: 'en'});
     $('#landing-btn').colorbox(this.get('landingColorboxConfig'));
   },
 
   doLocaleES: function(event) {
-    $.colorbox.remove();
     Checklist.router.transitionTo('home.index', {locale: 'es'});
     $('#landing-btn').colorbox(this.get('landingColorboxConfig'));
   },
 
   doLocaleFR: function(event) {
-    $.colorbox.remove();
     Checklist.router.transitionTo('home.index', {locale: 'fr'});
     $('#landing-btn').colorbox(this.get('landingColorboxConfig'));
   }

From f6f89093a01151c3e9dfccd18d96fef404154752 Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Wed, 23 Jul 2014 13:00:23 +0100
Subject: [PATCH 36/58] pass locale to auto complete

---
 app/javascripts/views/checklist_form.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/javascripts/views/checklist_form.js b/app/javascripts/views/checklist_form.js
index 4431fba..50f209d 100644
--- a/app/javascripts/views/checklist_form.js
+++ b/app/javascripts/views/checklist_form.js
@@ -36,6 +36,7 @@ Checklist.SearchTextField = Em.TextField.extend({
       param_name: 'scientific_name',
       value: event.value,
       visibility: 'checklist',
+      locale: Em.I18n.currentLocale,
       per_page: 10
     };
 

From 1c5c56ec7289ff6d6e25b6e47cb53b8819937277 Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Thu, 24 Jul 2014 16:53:35 +0100
Subject: [PATCH 37/58] about page FR

---
 app/static/about_page_fr.html | 141 ++++++++++++----------------------
 1 file changed, 51 insertions(+), 90 deletions(-)

diff --git a/app/static/about_page_fr.html b/app/static/about_page_fr.html
index ea1b929..c434e90 100644
--- a/app/static/about_page_fr.html
+++ b/app/static/about_page_fr.html
@@ -2,153 +2,114 @@
   <div class="content">
     <div class="c1">
       <div class="content-left">
-        <h2><a id="cites-checklist">FR CITES Checklist</a></h2>
+        <h2><a id="cites-checklist">La liste de contrôle CITES</a></h2>
         <p>
-        The <span class="bold">Checklist of CITES Species</span> provides the official list of CITES-listed species (scientific names)
-        and their associated scientific synonyms; common names in English, French and Spanish (where available) and the CITES Appendix
-        in which they are currently listed (see <a href="http://www.cites.org/eng/res/12/12-11R16.php">Resolution 12.11 (Rev CoP16)</a>).
-        Information on historical Appendix listings, reservations and level of listing (e.g. if a whole family or order is listed)
-        is also available through this website.
+        La <span class="bold">Liste de contrôle des espèces CITES</span> est la liste officielle des espèces CITES (sous leurs noms scientifiques), de leurs synonymes scientifiques, de leurs noms communs en anglais, français et espagnol (dans la mesure où ils sont disponibles) avec l'indication de l'annexe à laquelle elles sont inscrites [voir la <a href="http://www.cites.org/eng/res/12/12-11R16.php">Résolution 12.11 (Rev Cop16)</a>].
+        Des informations sur l’historique des inscriptions aux annexes, sur les réserves, et le niveau taxonomique d'inscription aux annexes (par exemple, l'ensemble d'une famille ou d'un groupe) sont également disponibles sur le présent site web.
         </p>
 
-        <h2><a id="web-display">Web display &#38; data downloads</a></h2>
+        <h2><a id="web-display">L’affichage web et le téléchargement de données</a></h2>
         <p>
-        Users can search for and view CITES listing information for CITES-listed species online. The scientific name, higher taxonomy,
-        scientific synonyms, common names, distribution, current listing and history of listings (in the form of timelines) are all visible
-        through the web display. Filters applied to the search and the Advanced options (see below) also affect the data displayed online.
+        Les utilisateurs peuvent rechercher et consulter, en ligne, les informations relatives aux espèces CITES. Le nom scientifique, le niveau taxonomique supérieur, les synonymes scientifiques, les noms communs, la distribution géographique, l’inscription actuelle et l’historique de l'inscription (dans l’ordre chronologique) sont accessibles sur ce site. Les filtres appliqués aux recherches et aux options avancées (voir ci-dessous) ont aussi un effet sur les données affichées en ligne.
         </p>
         <p>
-          Two distinct outputs are available for download through this website:
+          Deux types de résultats peuvent être téléchargés sur ce site:
         </p>
         <ol>
-          <li><span class="bold italic">Index of CITES species:</span> an alphabetical list of all animal and plant taxa currently included in
-            the CITES Appendices; and </li>
-            <li><span class="bold italic">History of CITES listings:</span> a historical record of all CITES listings since 1975, including all
-            reservations and annotations ever made.</li>
+          <li><span class="bold italic">Le Répertoire des espèces CITES:</span> une liste alphabétique de tous les taxons animaux et végétaux inscrits aux Annexes CITES; et</li>
+          <li><span class="bold italic">Les Annales des inscriptions à la CITES:</span> un historique de toutes les inscriptions à la CITES depuis 1975, y compris toutes les réserves et annotations jamais faites.</li>
         </ol>
         <p>
-          Both outputs are available in three different formats: PDF, csv (for use in Excel) and JSON format (for use by web developers).
+        Ces deux résultats sont disponibles dans trois formats différents: PDF, CSV (pour utilisation Excel) et JSON (à l'intention des concepteurs de pages web).
         </p>
-        <p><span class="bold">Note on csv files:</span> For the first time, users can now download the official list of CITES-listed species in
-        Excel-ready csv files. The csv files downloadable through this site use commas as separators;
-        this might conflict the regional settings of some computer systems.</p>
+        <p><span class="bold">Remarque sur les fichiers CSV:</span> Pour la première fois, les utilisateurs peuvent télécharger la liste officielle des espèces CITES dans un fichier CSV utilisable directement dans Excel. Les fichiers CSV téléchargeables sur ce site utilisent les virgules comme séparateur, ce qui peut poser des problèmes de compatibilité avec les paramètres régionaux de certains systèmes informatiques.</p>
 
         <p>
-          The full <span class="italic">Index of CITES species</span> and <span class="italic">History of CITES listings</span> are always available
-          on the right hand side of the website under <b>&#8220;Featured&#8221; </b>. In the   case of the <span class="italic">Index of CITES species</span>,
-          the full version of this can also be downloaded through the red &#8220;Download&#8221; button if no filters are selected.
-          In addition users also have the flexibility to produce tailored versions of the <span class="italic">Index of
-          CITES species</span> outputs depending on their needs. Most notably, users can filter by name (including higher taxa), CITES Appendix and
-          country/territory/region of occurrence (&#8220;All locations&#8221;).
-          These filters will then filter the data displayed on the website, as well as the data downloaded through the red &#8220;Download&#8221; button,
-          so that users can view and download smaller subsets of data.
-        </p> 
+        Le <span class="italic">Répertoire des espèces CITES</span> et les <span class="italic">Annales des inscriptions à la CITES</span> sont toujours disponibles, dans leur intégralité, sur le côté droit de la page web, sous l’onglet <b>&#8220;Options&#8221; </b>. Le <span class="italic">Répertoire des espèces CITES</span> peut aussi être téléchargé en entier en cliquant sur le bouton rouge &#8220;Télécharger&#8221;, si aucun filtre n’a été sélectionné.
+        De plus les utilisateurs ont la possibilité de produire des versions personnalisées du <span class="italic">Répertoire des espèces CITES</span> en fonction de leur besoins. Ils peuvent, par exemple, filtrer par nom (y compris les taxons supérieurs), par annexe CITES ou par pays/territoire/région où l'espèce est présente (&#8220;tous les endroits&#8221;). Ces filtres permettent ensuite de filtrer les données affichées sur le site, de même que les données téléchargées à l'aide du bouton rouge &#8220;Télécharger&#8221;. Les utilisateurs peuvent ainsi visionner et télécharger des sous-ensembles de données.
+        </p>
         <p>
-        <span class="bold">Note</span>: Filters for country/territory/region of occurrence include all taxa associated with that geographic entity, including
-        taxa that are recorded as extinct, introduced or re-introduced in that area. Filters do not apply to the <span class="italic">History of CITES listings</span>
-        outputs, which are only available in full through the &#8220;History of listing&#8221; link under <b>&#8220;Featured&#8221; </b>.
+        <span class="bold">Remarque</span>: Les filtres par pays/territoire/région où l'espèce est présente recouvrent tous les taxons associés à cette entité géographique, y compris les taxons enregistrés comme éteints, introduits ou réintroduits dans cette zone. Les détails complets des caractéristiques de distribution sont disponibles au téléchargement dans fichier CSV compatible avec Excel. Ces filtres ne s'appliquent pas aux résultats des <span class="italic">Annales des inscriptions à la CITES</span>, disponibles uniquement en version complète via le lien &#8220;Annales des inscriptions&#8221; sous l’onglet <b>&#8220;Option&#8221;</b>.
         </p>
-        <h3 class="bold">Browser compatibility</h3>
-        <p>This site is optimised for Internet Explorer 8, 9 and 10, Firefox, Safari and Google Chrome.
-          The site may not display properly in older browsers.</p>
+        <h3 class="bold">Compatibilité du navigateur</h3>
+        <p>Optimisé pour Internet Explorer 8,9 et 10, Firefox, Safari et Google Chrome, ce site ne s’affichera peut-être pas correctement dans les navigateurs plus anciens.</p>
 
-        <h2><a id="advanced-options">Advanced options:</a></h2>
+        <h2><a id="advanced-options">Options avancées:</a></h2>
         <p>
-          Under &#8220;Advanced options&#8221; users are able to tailor the web display and Checklist outputs as follows:
+        Sous l’onglet &#8220;Options avancées&#8221;, les utilisateurs ont la possibilité de personnaliser l’affichage web et les résultats de la Liste de contrôle comme suit:
         </p>
         <ul>
           <li>
-          <span class="bold">Common names:</span> By de-selecting &#8216;ENG&#8217;, &#8216;SPA&#8217;, and &#8216;FRE&#8217;, this will remove the English, Spanish and
-          French common names on both the web display and within the Index downloads accessible through the red &#8220;Download&#8221; button;
+           <span class="bold">Noms communs:</span> En désactivant &#8216;ENG&#8217;, &#8216;SPA&#8217;, and &#8216;FRE&#8217;, vous supprimez les noms communs en anglais, espagnol et français dans l’affichage web mais aussi dans les téléchargements de l’Index accessibles via le bouton rouge &#8220;Télécharger&#8221;;
           </li>
           <li>
-            <span class="bold">Online view:</span> Selecting &#8220;Alphabetical&#8221; or &#8216;Taxonomic&#8217; affects the way the taxonomic entities are sorted on the
-            web view only. The PDF and csv outputs will always be   sorted alphabetically. &#8220;Appendix&#8221; view, when selected, mirrors the display of the CITES Appendices,
-            showing taxa at the level at which they are listed in taxonomic   order. For instance, &#8220;Felidae spp.&#8221; will be included because there is a family
-            listing that applies, but species within Felidae that are included in the family level listing would not appear in the web display. NB: species included within
-            a higher level listing would not be searchable if this format is selected. 
+            <span class="bold">Visualisation en ligne:</span> En sélectionnant &#8220;Alphabétique&#8221; ou &#8220;Taxonomique&#8221;, vous modifiez uniquement la manière dont les entités taxonomiques sont classées dans l'affichage web. Les résultats en PDF et CSV sont toujours classés par ordre alphabétique. En sélectionnant visualiser &#8220;Annexes&#8221;, vous accéder aux annexes CITES dans leur intégralité, avec les taxons au niveau auquel ils sont classés dans l’ordre taxonomique. Par exemple, vous verrez apparaître &#8220;Felidae spp.&#8221; car il s'agit de l'inscription d'une famille, mais les espèces de la famille des Felidae n’apparaitront pas dans l’affichage web. NB: Vous ne trouverez pas d'espèces inscrites à un niveau taxonomique supérieur si vous sélectionnez ce format.
           </li>
           <li>
-          <span class="bold">Display:</span> These options affect the information displayed for each taxon on the website.
+            <span class="bold">Affichage:</span> Ces options influencent les informations affichées pour chaque taxon sur le site.
           </li>
-          
             <ul>
-              <li> 
-                <span class="bold">Synonyms:</span> When ticked, scientific synonyms (where available) will be shown in the web display (and within the PDF and csv outputs for the
-                <span class="italic">Index of CITES species</span>). Unticking this will remove the synonyms from the web display and the tailored downloads.
+              <li>
+                <span class="bold">Synonymes:</span> Quand cette option est activée, les synonymes scientifiques (lorsqu'ils sont disponibles) apparaissent dans l’affichage web (et dans les résultats en PDF et CSV pour le <span class="italic">Répertoire des espèces CITES</span>). Le fait de ne pas cocher cette option supprime les synonymes de l’affichage web et des téléchargements personnalisés.
               </li>
               <li>
-                <span class="bold">Author&#8217;s name:</span> When ticked, the author citations for taxa will be shown in the web display (and within the PDF and csv outputs).
-                Unticking this will remove the author citation from the web display and the tailored downloads.
+                <span class="bold">Nom de l&#8217;auteur:</span> Quand cette option est activée, le nom de l'auteur apparaît pour les taxons dans l'affichage web et les téléchargements personnalisés. Si vous ne cochez pas cette option, vous supprimez la mention du nom de l'auteur dans l’affichage web et les téléchargements personnalisés.
               </li>
               <li>
-                <span class="bold">History of listing:</span> When ticked, the history of listing (displayed online as a timeline) will expand for all taxa on the page.
-                This does not impact the downloads.
+                <span class="bold">Annale des inscriptions:</span> Quand cette option est activée, l’Annale des inscriptions (affichée en ligne sous forme de frise chronologique) s’étend à tous les taxons de la page, sans aucun effet sur les téléchargements.
               </li>
             </ul>
-          
         </ul>
-        <h2><a id="timelines">Timelines:</a></h2>
+        <h2><a id="timelines">Frise chronologique:</a></h2>
         <p>
-          Timelines provide a visual display of the history of CITES listings on the web display. Symbols on the timelines indicate the inclusion of a taxon in an
-          Appendix (&#8216;+&#8217;), the removal/deletion of a taxa from an Appendix (&#8216;-&#8217;), and a change to an annotation relevant to the Appendix listing
-          (&#8216;A&#8217;). For timelines displaying reservation information, &#8216;R&#8217; indicates a reservation that was entered by a Party and &#8220;W&#8221;
-          indicates that the Party has withdrawn the reservation. The exact date of the event can be viewed by hovering over the symbols; more details on the listings,
-          reservations or any changes to annotations can be viewed by clicking on the symbols associated with the timeline event. The Appendix symbol representing the
-          current listing (displayed to the right of the scientific name) is also clickable to view additional listing information or annotations that may apply.
+        La frise chronologique (<span class="italic">Timelines</span>) permet de visualiser l'historique des inscriptions à la CITES. Les symboles qui apparaissent sur la frise chronologique indiquent l’inscription d’un taxon à une annexe (&#8216;+&#8217;), le retrait/la suppression d’un taxon d’une annexe (&#8216;-&#8217;), et un changement dans une annotation importante pour l'inscription aux annexes (&#8216;A&#8217;). Pour que la frise chronologique affiche des informations sur les réserves, &#8216;R&#8217; indique qu'une réserve a été émise par une Partie et &#8220;W&#8221; indique que la Partie a retiré sa réserve. Vous verrez la date exacte de cet événement en passant le curseur de la souris au-dessus des symboles. Si vous voulez voir plus de détails sur les inscriptions, les réserves ou tout changement apporté aux annotations, cliquez sur les symboles associés à la frise chronologique des événements. Vous pouvez aussi cliquer sur le symbole des Annexes représentant les inscriptions actuelles (à droite des noms scientifiques) pour accéder à d'autres informations sur les inscriptions ou les annotations éventuellement applicables.
         </p>
 
-        <h2><a id="standard-nomenclature">Standard nomenclatural references used</a></h2>
-        <p>Taxonomic names that have been officially adopted by the Conference of the Parties [see the list of standard nomenclatural references in
-          <a href="http://www.cites.org/eng/res/12/12-11R16.php">Resolution Conf. 12.11 (Rev. CoP16)]</a> appear in boldface in the <span class="italic">Checklist</span>,
-          e.g. <span class="bold italic">Acinonyx jubatus</span> (the cheetah). This is the case for most taxa. In some cases, nevertheless, a standard nomenclatural reference
-          for the constituent species of a higher taxon has not yet been adopted. In such instances, a reference identified by UNEP-WCMC has been used. The names of these taxa
-          are not in boldface, e.g. <span class="italic">Tridacna maxima</span> (or any Tridacnidae species), as in previous printed versions of the <span class="italic">Checklist</span>.
+        <h2><a id="standard-nomenclature">Les références de nomenclature normalisées</a></h2>
+        <p>Les noms taxonomiques qui ont été officiellement adoptés par la Conférence des Parties [voir la liste des références de nomenclature normalisées dans la
+          <a href="http://www.cites.org/eng/res/12/12-11R16.php">Résolution Conf. 12.11 (Rev.CoP16)</a>] apparaissent en caractères gras dans la <span class="italic">Liste de contrôle</span>,
+          par exemple <span class="bold italic">Acinonyx jubatus</span> (le guépard). C’est le cas pour la plupart des taxons. Il arrive cependant qu'aucune référence de nomenclature normalisée n'ait été adoptée pour les espèces constituant un taxon supérieur. Dans ce cas, une référence définie par le PNUE-WCMC aura été utilisée. Le nom de ces taxons n'est pas inscrit en gras, par exemple <span class="italic">Tridacna maxima</span> (ou n’importe quelle espèce de Tridacnidae), comme dans les versions imprimées antérieures de la <span class="italic">Liste de contrôle</span>.
         </p>
 
-        <h2><a id="contributors">CITES Checklist contributors</a></h2>
-        <p>The CITES Checklist was developed by UNEP-WCMC on behalf of the CITES Secretariat.
-          Financial support to maintain this database has come from a range of sources, on a project 
-          or longer-term basis. Current funders, supporting portions of the maintenance of the underlying data include:
-          WCMC (UK), the European Union and the CITES Secretariat.</p>
+        <h2><a id="contributors">Les bailleurs de fonds de la Liste de contrôle CITES</a></h2>
         <p>
-          This information resource is a result of long-term collaboration between countless individual scientists worldwide 
-          and many organizations whose contribution is gratefully acknowledged.
+        La Liste de contrôle CITES a été mise au point par le PNUE-WCMC, pour le compte du Secrétariat CITES. La gestion de cette base de données est soutenue financièrement par de multiples partenaires, que ce soit dans le cadre d’un projet ou à plus long terme. Au nombre des bailleurs de fonds actuels figurent: le WCMC (Royaume-Uni), l’Union Européenne et le Secrétariat CITES.</p>
+        <p>
+        Cette source d’information est le fruit d’une longue collaboration entre d’innombrables scientifiques du monde entier et de nombreuses organisations, dont la contribution est vivement appréciée.
         </p>
 
-
         <h2><a id="contact">Contact</a></h2>
         <div class="contacts">
         <div class="left">
-          <span class="bold">CITES Secretariat</span><br>
-          International Environment House<br>
+          <span class="bold">Secrétariat CITES</span><br>
+          Maison internationale de l'environnement <br>
           15, Chemin des Anémones<br>
-          CH 1219 Châtelaine (Geneva)<br>
-          Switzerland<br>
-          Tel: + 41 (0) 22 917 81 39/40<br>
+          CH 1219 Châtelaine (Genève)<br>
+          Suisse<br>
+          Tél.: + 41 (0) 22 917 81 39/40<br>
           Email: <a href="mailto:info@cites.org">info@cites.org</a><br>
-          Website: <a href="http://www.cites.org">www.cites.org</a><br>
+          Site web: <a href="http://www.cites.org">www.cites.org</a><br>
         </div>
         <div class="right">
-          <span class="bold">UNEP World Conservation Monitoring Centre</span><br>
+          <span class="bold">PNUE-Centre mondial de surveillance continue de la conservation</span><br>
           219 Huntingdon Road<br>
           Cambridge<br>
           CB3 0DL<br>
-          United Kingdom<br>
-          Tel: +44 (0) 1223 277314<br>
+          Royaume-Uni<br>
+          Tél.: +44 (0) 1223 277314<br>
           Email: <a href="mailto:species@unep-wcmc.org" target="_top">species@unep-wcmc.org</a><br>
-          Website: <a href="http://www.unep-wcmc.org">www.unep-wcmc.org</a><br>
+          Site web: <a href="http://www.unep-wcmc.org">www.unep-wcmc.org</a><br>
         </div>
         </div>
       </div>
       <div class="menu-right">
         <ul>
-          <li><a href="#cites-checklist" class="scroll-to">CITES Checklist</a></li>
-          <li><a href="#web-display" class="scroll-to">Web display &#38; data downloads</a></li>
-          <li><a href="#advanced-options" class="scroll-to">Advanced options</a></li>
-          <li><a href="#timelines" class="scroll-to">Timelines</a></li>
-          <li><a href="#standard-nomenclature" class="scroll-to">Standard nomenclature</a></li>
-          <li><a href="#contributors" class="scroll-to">Contributors</a></li>
+          <li><a href="#cites-checklist" class="scroll-to">La liste de contrôle CITES</a></li>
+          <li><a href="#web-display" class="scroll-to">L’affichage web et le téléchargement de données</a></li>
+          <li><a href="#advanced-options" class="scroll-to">Options avancées</a></li>
+          <li><a href="#timelines" class="scroll-to">Frise chronologique</a></li>
+          <li><a href="#standard-nomenclature" class="scroll-to">Les références de nomenclature normalisées</a></li>
+          <li><a href="#contributors" class="scroll-to">Les bailleurs de fonds de la Liste de contrôle CITES</a></li>
           <li><a href="#contact" class="scroll-to">Contact</a></li>
         </ul>
       </div>

From 778a2c2c915b42dda2672af5b98276aa0ab58181 Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Thu, 24 Jul 2014 17:32:19 +0100
Subject: [PATCH 38/58] about page ES

---
 app/javascripts/locales/es.js |   2 +-
 app/static/about_page_es.html | 159 ++++++++++++++--------------------
 2 files changed, 65 insertions(+), 96 deletions(-)

diff --git a/app/javascripts/locales/es.js b/app/javascripts/locales/es.js
index 8e8c808..1807951 100644
--- a/app/javascripts/locales/es.js
+++ b/app/javascripts/locales/es.js
@@ -1,6 +1,6 @@
 Em.I18n.locales.es = {
   'title': 'Lista de especies CITES',
-  'about.title': 'Acerca de la Lista de especies CITES',
+  'about.title': 'Sobre la Lista de referencia CITES',
   'terms.title': 'Condiciones de uso',
   'toplink.about': 'Acerca de',
   'toplink.terms': 'Condiciones de uso',
diff --git a/app/static/about_page_es.html b/app/static/about_page_es.html
index 6f67e54..6b466ab 100644
--- a/app/static/about_page_es.html
+++ b/app/static/about_page_es.html
@@ -2,154 +2,123 @@
   <div class="content">
     <div class="c1">
       <div class="content-left">
-        <h2><a id="cites-checklist">ES CITES Checklist</a></h2>
+        <h2><a id="cites-checklist">Lista de referencia CITES</a></h2>
         <p>
-        The <span class="bold">Checklist of CITES Species</span> provides the official list of CITES-listed species (scientific names)
-        and their associated scientific synonyms; common names in English, French and Spanish (where available) and the CITES Appendix
-        in which they are currently listed (see <a href="http://www.cites.org/eng/res/12/12-11R16.php">Resolution 12.11 (Rev CoP16)</a>).
-        Information on historical Appendix listings, reservations and level of listing (e.g. if a whole family or order is listed)
-        is also available through this website.
+        La <span class="bold">Lista de referencia de Especies CITES</span> es la lista oficial de las especies incluidas en los Apéndices de la CITES (nombres científicos) y sus sinónimos científicos asociados, así como los nombres comunes en inglés, francés y español (cuando se dispone de ellos) y el Apéndice de la CITES en el que están incluidas actualmente (véase la <a href="http://www.cites.org/eng/res/12/12-11R16.php">Resolución Conf. 12.11 (Rev. CoP16)</a>).
+        En este sitio web también se dispone de información sobre las inclusiones históricas en los Apéndices, las reservas y el nivel de las inclusiones (por ejemplo, si están incluidos una familia o un orden completos).
         </p>
 
-        <h2><a id="web-display">Web display &#38; data downloads</a></h2>
+        <h2><a id="web-display">Visualización en la web y descargas de datos</a></h2>
         <p>
-        Users can search for and view CITES listing information for CITES-listed species online. The scientific name, higher taxonomy,
-        scientific synonyms, common names, distribution, current listing and history of listings (in the form of timelines) are all visible
-        through the web display. Filters applied to the search and the Advanced options (see below) also affect the data displayed online.
+        Los usuarios pueden buscar y ver en línea información sobre las especies incluidas en los Apéndices de la CITES. La visualización en la web muestra los nombres científicos, la taxonomía superior, los sinónimos científicos, los nombres comunes, la distribución, la inclusión actual y el historial de las inclusiones (en forma de cronogramas). La aplicación de filtros a la búsqueda y las opciones avanzadas (véase infra ) también afectan a los datos que se muestran en línea.
         </p>
         <p>
-          Two distinct outputs are available for download through this website:
+        A través de este sitio web se dispone de dos resultados distintos:
         </p>
         <ol>
-          <li><span class="bold italic">Index of CITES species:</span> an alphabetical list of all animal and plant taxa currently included in
-            the CITES Appendices; and </li>
-            <li><span class="bold italic">History of CITES listings:</span> a historical record of all CITES listings since 1975, including all
-            reservations and annotations ever made.</li>
+          <li>
+          <span class="bold italic">Índice de especies CITES:</span> Lista alfabética de todos los taxa de animales y plantas incluidos actualmente en los Apéndices de la CITES; y
+          </li>
+          <li>
+          <span class="bold italic">Historia de las inclusiones en los Apéndices de la CITES:</span> Registro histórico de todas las inclusiones en la CITES desde 1975, con inclusión de todas las reservas y anotaciones que se han hecho.
+          </li>
         </ol>
         <p>
-          Both outputs are available in three different formats: PDF, csv (for use in Excel) and JSON format (for use by web developers).
+        Ambos resultados están disponibles en tres formatos: PDF, csv (para uso con Excel) y formato JSON (para uso de desarrolladores de web).
         </p>
-        <p><span class="bold">Note on csv files:</span> For the first time, users can now download the official list of CITES-listed species in
-        Excel-ready csv files. The csv files downloadable through this site use commas as separators;
-        this might conflict the regional settings of some computer systems.</p>
+        <p>
+        <span class="bold">Nota sobre los ficheros csv:</span> Por primera vez, los usuarios pueden ahora descargar la lista oficial de las especies incluidas en los Apéndices de la CITES como ficheros para su uso en Excel. Los ficheros csv descargables mediante este sitio web utilizan comas como separadores; esto puede generar conflictos con las especificaciones regionales de algunos sistemas informáticos.</p>
 
         <p>
-          The full <span class="italic">Index of CITES species</span> and <span class="italic">History of CITES listings</span> are always available
-          on the right hand side of the website under <b>&#8220;Featured&#8221; </b>. In the   case of the <span class="italic">Index of CITES species</span>,
-          the full version of this can also be downloaded through the red &#8220;Download&#8221; button if no filters are selected.
-          In addition users also have the flexibility to produce tailored versions of the <span class="italic">Index of
-          CITES species</span> outputs depending on their needs. Most notably, users can filter by name (including higher taxa), CITES Appendix and
-          country/territory/region of occurrence (&#8220;All locations&#8221;).
-          These filters will then filter the data displayed on the website, as well as the data downloaded through the red &#8220;Download&#8221; button,
-          so that users can view and download smaller subsets of data.
-        </p> 
+          El <span class="italic">Índice de especies CITES</span> completo y la <span class="italic">Historia de las inclusiones en los Apéndices de la CITES</span> están siempre disponibles en la parte derecha de la página web bajo <b>&#8220;Destacados&#8221; </b>. En el caso del <span class="italic">Índice de especies CITES</span>,la versión completa de éste también se puede descargar mediante el botón rojo &#8220;Descarga&#8221; si no se han seleccionado filtros. Además, los usuarios también tienen la flexibilidad de producir versiones personalizadas de los resultados del <span class="italic">Index of
+          CITES species</span> dependiendo de sus necesidades. Cabe resaltar en particular que los usuarios pueden filtrar por nombre (incluyendo taxa superiores), el Apéndice de la CITES y el país/territorio/región de distribución (&#8220;Todas las localizaciones&#8221;).
+          Estos filtros filtrarán luego los datos mostrados en el sitio web, además de los datos descargados mediante el botón rojo &#8220;Descarga&#8221;, para que los usuarios puedan ver y descargar subconjuntos de datos más reducidos.
+        </p>
+        <p>
+        <span class="bold">Nota</span>: Los filtros para el país/territorio/región de distribución incluyen todos los taxa asociados con esa entidad geográfica, comprendidos los taxa regisrados como extinguidos, introducidos o reintroducidos en esa área. Los detalles completos de estos atributos de distribución están disponibles en las descargas csv compatibles con Excel. Los filtros no se pueden aplicar a los resultados de la <span class="italic">Historia de las inclusiones en los Apéndices de la CITES</span>, de los que sólo se dispone de forma completa a través del vínculo &#8220;Historia de las inclusiones&#8221; bajo <b>&#8220;Destacados&#8221; </b>.
+        </p>
+        <h3 class="bold">Compatibilidad de navegador</h3>
         <p>
-        <span class="bold">Note</span>: Filters for country/territory/region of occurrence include all taxa associated with that geographic entity, including
-        taxa that are recorded as extinct, introduced or re-introduced in that area. Filters do not apply to the <span class="italic">History of CITES listings</span>
-        outputs, which are only available in full through the &#8220;History of listing&#8221; link under <b>&#8220;Featured&#8221; </b>.
+        Este sitio web está optimizado para Internet Explorer 8, 9 y 10, Firefox, Safari y Google Chrome. El sitio podría no funcionar correctamente en navegadores más antiguos.
         </p>
-        <h3 class="bold">Browser compatibility</h3>
-        <p>This site is optimised for Internet Explorer 8, 9 and 10, Firefox, Safari and Google Chrome.
-          The site may not display properly in older browsers.</p>
 
-        <h2><a id="advanced-options">Advanced options:</a></h2>
+        <h2><a id="advanced-options">Opciones avanzadas:</a></h2>
         <p>
-          Under &#8220;Advanced options&#8221; users are able to tailor the web display and Checklist outputs as follows:
+        Bajo &#8220;Opciones avanzadas&#8221;, los usuarios pueden ajustar las visualizaciones en la web y los resultados de la Lista de referencia como sigue:
         </p>
         <ul>
           <li>
-          <span class="bold">Common names:</span> By de-selecting &#8216;ENG&#8217;, &#8216;SPA&#8217;, and &#8216;FRE&#8217;, this will remove the English, Spanish and
-          French common names on both the web display and within the Index downloads accessible through the red &#8220;Download&#8221; button;
+          <span class="bold">Nombres comunes:</span> Desactivando la selección de &#8216;ENG&#8217;, &#8216;SPA&#8217; y &#8216;FRE&#8217;, se eliminarán los nombres comunes en inglés, español y francés tanto en la visualización en la web como en las descargas del Índice accesibles mediante el botón rojo &#8220;Descarga&#8221;;
           </li>
           <li>
-            <span class="bold">Online view:</span> Selecting &#8220;Alphabetical&#8221; or &#8216;Taxonomic&#8217; affects the way the taxonomic entities are sorted on the
-            web view only. The PDF and csv outputs will always be   sorted alphabetically. &#8220;Appendix&#8221; view, when selected, mirrors the display of the CITES Appendices,
-            showing taxa at the level at which they are listed in taxonomic   order. For instance, &#8220;Felidae spp.&#8221; will be included because there is a family
-            listing that applies, but species within Felidae that are included in the family level listing would not appear in the web display. NB: species included within
-            a higher level listing would not be searchable if this format is selected. 
+            <span class="bold">Visualización en línea:</span> La selección &#8220;Alfabética&#8221; o &#8220;Taxonómica&#8221; afecta a la forma en que se organizan las entidades taxonómicas sólo en la visualización web. Los resultados PDF y csv siempre se organizarán alfabéticamente. La vista de &#8220;Apéndice&#8221;, cuando se selecciona, refleja la visualización de los Apéndices de la CITES, mostrando los taxa al nivel al que están incluidos en orden taxonómico. Por ejemplo, se incluirá &#8220;Felidade spp.&#8221; porque se aplica a la inclusión a nivel de familia, pero las especies dentro de Felidae incluidas a nivel de familia no aparecerían en la visualización web. Nota: las especies incluidas como parte de una inclusión a nivel superior no se podrían buscar si se ha elegido este formato.
           </li>
           <li>
-          <span class="bold">Display:</span> These options affect the information displayed for each taxon on the website.
+          <span class="bold">Visualización:</span> Estas opciones afectan a la información mostrada para cada taxón en el sitio web.
           </li>
-          
-            <ul>
-              <li> 
-                <span class="bold">Synonyms:</span> When ticked, scientific synonyms (where available) will be shown in the web display (and within the PDF and csv outputs for the
-                <span class="italic">Index of CITES species</span>). Unticking this will remove the synonyms from the web display and the tailored downloads.
-              </li>
-              <li>
-                <span class="bold">Author&#8217;s name:</span> When ticked, the author citations for taxa will be shown in the web display (and within the PDF and csv outputs).
-                Unticking this will remove the author citation from the web display and the tailored downloads.
-              </li>
-              <li>
-                <span class="bold">History of listing:</span> When ticked, the history of listing (displayed online as a timeline) will expand for all taxa on the page.
-                This does not impact the downloads.
-              </li>
-            </ul>
-          
+          <ul>
+            <li>
+              <span class="bold">Sinónimos:</span> Cuando se seleccionan, los sinónimos científicos (si se dispone de ellos) se mostrarán en la visualización web (y dentro de los resultados PDF y csv para el <span class="italic">Índice de especies CITES</span>). Desactivando la selección se eliminarán los sinónimos de la visualización web y las descargas personalizadas.
+            </li>
+            <li>
+              <span class="bold">Nombre del autor:</span> Cuando se selecciona, las referencias al autor de los taxa se mostrarán en la visualización web (y dentro de los resultados PDF y csv). Desactivando esta selección se eliminarán la referencia al autor de la visualización web y las descargas personalizadas.
+            </li>
+            <li>
+              <span class="bold">Historia de las inclusiones:</span> Cuando se selecciona, la historia de las inclusiones (mostrada en línea como un cronograma) se expandirá a todos los taxa en la página. Esto no afecta a las descargas.
+            </li>
+          </ul>
         </ul>
-        <h2><a id="timelines">Timelines:</a></h2>
+        <h2><a id="timelines">Cronogramas:</a></h2>
         <p>
-          Timelines provide a visual display of the history of CITES listings on the web display. Symbols on the timelines indicate the inclusion of a taxon in an
-          Appendix (&#8216;+&#8217;), the removal/deletion of a taxa from an Appendix (&#8216;-&#8217;), and a change to an annotation relevant to the Appendix listing
-          (&#8216;A&#8217;). For timelines displaying reservation information, &#8216;R&#8217; indicates a reservation that was entered by a Party and &#8220;W&#8221;
-          indicates that the Party has withdrawn the reservation. The exact date of the event can be viewed by hovering over the symbols; more details on the listings,
-          reservations or any changes to annotations can be viewed by clicking on the symbols associated with the timeline event. The Appendix symbol representing the
-          current listing (displayed to the right of the scientific name) is also clickable to view additional listing information or annotations that may apply.
+        Los cronogramas proporcionan una visualización de la Historia de las inclusiones en los Apéndices de la CITES en la web. Los símbolos en los cronogramas indican la inclusión de un taxón en un Apéndice (&#8216;+&#8217;), la eliminación de un taxón de un Apéndice (&#8216;-&#8217;) y un cambio en la anotación correspondiente a la inclusión en un Apéndice (&#8216;A&#8217;). Para los cronogramas que muestran información sobre las reservas, &#8216;R&#8217; indica una reserva introducida por una Parte, y &#8220;W&#8221; indica que la Parte ha retirado la reserva. La fecha exacta del evento se puede ver pasando el puntero del ratón sobre los símbolos; se pueden ver más detalles sobre las inclusiones, las reservas o los cambios en las anotaciones haciendo clic sobre el símbolo asociado al evento en el cronograma. También se puede hacer clic sobre el símbolo del Apéndice que representa la inclusión actual (mostrado a la derecha del nombre científico) para ver información adicional sobre la inclusión o anotaciones que puedan existir.
         </p>
 
-        <h2><a id="standard-nomenclature">Standard nomenclatural references used</a></h2>
-        <p>Taxonomic names that have been officially adopted by the Conference of the Parties [see the list of standard nomenclatural references in
-          <a href="http://www.cites.org/eng/res/12/12-11R16.php">Resolution Conf. 12.11 (Rev. CoP16)]</a> appear in boldface in the <span class="italic">Checklist</span>,
-          e.g. <span class="bold italic">Acinonyx jubatus</span> (the cheetah). This is the case for most taxa. In some cases, nevertheless, a standard nomenclatural reference
-          for the constituent species of a higher taxon has not yet been adopted. In such instances, a reference identified by UNEP-WCMC has been used. The names of these taxa
-          are not in boldface, e.g. <span class="italic">Tridacna maxima</span> (or any Tridacnidae species), as in previous printed versions of the <span class="italic">Checklist</span>.
+        <h2><a id="standard-nomenclature">Referencias sobre nomenclatura normalizada utilizadas</a></h2>
+        <p>
+        Los nombres taxonómicos que han sido adoptados oficialmente por la Conferencia de las Partes [vea la lista de referencias normalizadas en la <a href="http://www.cites.org/eng/res/12/12-11R16.php">Resolución Conf. 12.11 (Rev. CoP16)</a>] aparecen en negrita en la  <span class="italic">Lista</span>, por ejemplo, <span class="bold italic">Acinonyx jubatus</span> (el guepardo). Este es el caso para la mayoría de los taxa. Algunas veces, sin embargo, aún no se ha adoptado una referencia sobre nomenclatura normalizada para las especies que forman parte de una categoría taxonómica superior. En tales casos, se ha utilizado una referencia identificada por el PNUMA-WCMC. Los nombres de estos taxa no están en negrita, por ejemplo, <span class="italic">Tridacna maxima</span> (u otras especies de Tridacnidae), siguiendo el patrón de versiones anteriores impresas de la <span class="italic">Lista</span>.
         </p>
 
-        <h2><a id="contributors">CITES Checklist contributors</a></h2>
-        <p>The CITES Checklist was developed by UNEP-WCMC on behalf of the CITES Secretariat.
-          Financial support to maintain this database has come from a range of sources, on a project 
-          or longer-term basis. Current funders, supporting portions of the maintenance of the underlying data include:
-          WCMC (UK), the European Union and the CITES Secretariat.</p>
+        <h2><a id="contributors">Colaboradores de la Lista de referencia CITES</a></h2>
         <p>
-          This information resource is a result of long-term collaboration between countless individual scientists worldwide 
-          and many organizations whose contribution is gratefully acknowledged.
+        La lista de referencia CITES fue elaborada por el PNUMA-WCMC en nombre de la Secretaría de la CITES. Los fondos para mantener esta base de datos han procedido de varias fuentes, sobre la base de proyectos o de forma más extendida en el tiempo. Entre los patrocinadores actuales, que financian en parte el mantenimiento de los datos, figuran: WCMC (Reino Unido), la Unión Europea y la Secretaría de la CITES.
+        </p>
+        <p>
+        Este recurso de información es el resultado de colaboraciones de larga duración entre un gran número de científicos de todo el mundo y de muchas organizaciones cuya contribución se agradece sinceramente.
         </p>
 
-
-        <h2><a id="contact">Contact</a></h2>
+        <h2><a id="contact">Contacto</a></h2>
         <div class="contacts">
         <div class="left">
-          <span class="bold">CITES Secretariat</span><br>
+          <span class="bold">Secretaría de la CITES</span><br>
           International Environment House<br>
           15, Chemin des Anémones<br>
-          CH 1219 Châtelaine (Geneva)<br>
-          Switzerland<br>
+          CH 1219 Châtelaine (Genève)<br>
+          Suiza<br>
           Tel: + 41 (0) 22 917 81 39/40<br>
           Email: <a href="mailto:info@cites.org">info@cites.org</a><br>
-          Website: <a href="http://www.cites.org">www.cites.org</a><br>
+          Sitio web: <a href="http://www.cites.org">www.cites.org</a><br>
         </div>
         <div class="right">
           <span class="bold">UNEP World Conservation Monitoring Centre</span><br>
           219 Huntingdon Road<br>
           Cambridge<br>
           CB3 0DL<br>
-          United Kingdom<br>
+          Reino Unido<br>
           Tel: +44 (0) 1223 277314<br>
           Email: <a href="mailto:species@unep-wcmc.org" target="_top">species@unep-wcmc.org</a><br>
-          Website: <a href="http://www.unep-wcmc.org">www.unep-wcmc.org</a><br>
+          Sitio web: <a href="http://www.unep-wcmc.org">www.unep-wcmc.org</a><br>
         </div>
         </div>
       </div>
       <div class="menu-right">
         <ul>
-          <li><a href="#cites-checklist" class="scroll-to">CITES Checklist</a></li>
-          <li><a href="#web-display" class="scroll-to">Web display &#38; data downloads</a></li>
-          <li><a href="#advanced-options" class="scroll-to">Advanced options</a></li>
-          <li><a href="#timelines" class="scroll-to">Timelines</a></li>
-          <li><a href="#standard-nomenclature" class="scroll-to">Standard nomenclature</a></li>
-          <li><a href="#contributors" class="scroll-to">Contributors</a></li>
-          <li><a href="#contact" class="scroll-to">Contact</a></li>
+          <li><a href="#cites-checklist" class="scroll-to">Lista de referencia CITES</a></li>
+          <li><a href="#web-display" class="scroll-to">Visualización en la web y descargas de datos</a></li>
+          <li><a href="#advanced-options" class="scroll-to">Opciones avanzadas</a></li>
+          <li><a href="#timelines" class="scroll-to">Cronogramas</a></li>
+          <li><a href="#standard-nomenclature" class="scroll-to">Referencias sobre nomenclatura normalizada utilizadas</a></li>
+          <li><a href="#contributors" class="scroll-to">Colaboradores de la Lista de referencia CITES</a></li>
+          <li><a href="#contact" class="scroll-to">Contacto</a></li>
         </ul>
       </div>
     </div>

From f2f701a5fd0df020bbb720a9b9258c77942f4e90 Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Fri, 25 Jul 2014 10:53:41 +0100
Subject: [PATCH 39/58] terms page FR

---
 app/static/terms_of_use_page_fr.html | 58 ++++++++++++++--------------
 1 file changed, 28 insertions(+), 30 deletions(-)

diff --git a/app/static/terms_of_use_page_fr.html b/app/static/terms_of_use_page_fr.html
index d1126c6..e20ed43 100644
--- a/app/static/terms_of_use_page_fr.html
+++ b/app/static/terms_of_use_page_fr.html
@@ -1,52 +1,50 @@
 <div class="wrap">
   <div class="content">
     <div class="c1">
-        <h2>FR Terms and Conditions of Use of CITES Checklist Data</h2>
+        <h2>Conditions d’utilisation des données de la Liste de contrôle CITES</h2>
 
         <h2>1. INTRODUCTION</h2>
-        <p>Access to the information, data and attribute data provided through CITES Checklist website (the "Materials") is provided to the User on the understanding that the User reads and consents to be bound to the Terms and Conditions set out below. For the purposes of this Agreement, Materials comprise all the species lists, checklists and other information made available for download and contained within any part of the CITES Checklist website.</p>
+        <p>L’accès à l’information, aux données ainsi qu’aux données d’attributs assuré par l'intermédiaire du site ‘Liste de contrôle CITES’ ("Ressources") est fourni à l’Utilisateur à la condition que celui-ci lise et accepte les Conditions établies ci-dessous. Aux fins du présent Accord, les Ressources se composent de toutes les listes d’espèces, listes de contrôle et autres informations disponibles en téléchargement sur l'ensemble du site web Liste de contrôle CITES. </p>
 
-        <p class="strong">PLEASE READ THESE TERMS AND CONDITIONS CAREFULLY. IF YOU DO NOT AGREE TO ANY OF THE TERMS AND CONDITIONS, DO NOT DOWNLOAD. BY DOWNLOADING THE MATERIALS MADE AVAILABLE ON THE CITES CHECKLIST WEBSITE THE USER ACCEPTS AND AGREES TO COMPLY WITH THE TERMS AND CONDITIONS BELOW.</p>
+        <p class="strong">VEUILLEZ LIRE ATTENTIVEMENT CES CONDITIONS D'UTILISATION. SI VOUS NE CONSENTEZ PAS AUX PRÉSENTES CONDITIONS GÉNÉRALES, VEUILLEZ NE PAS TÉLÉCHARGER. EN TÉLÉCHARGEANT LES RESSOURCES DISPONIBLES SUR LE SITE WEB LISTE DE CONTRÔLE CITES, L’UTILISATEUR ACCEPTE DE SE CONFORMER AUX CONDITIONS D'UTILISATION CI-DESSOUS.</p>
 
-        <h2>2. PUBLISHING</h2>
-        <p>You may publish the Materials in whole or in part, including on-line, providing (a) the Materials are not downloadable and (b) the proper attribution is clearly visible (see clause 5 below). You must ensure that the most recently available version of the Materials is being used and that the date of download is visible in the published version. Materials published online must provide a clear link to the original on-line source (checklist.cites.org). We strongly recommend that you have the relevant materials reviewed by the CITES Secretariat prior to publication. Applications for permission, with a statement of purpose and extent of reproduction, should be sent to the CITES Secretariat, International Environment House, 15, Chemin des Anémones, CH 1219 Châtelaine (Geneva), Switzerland or via email to
-          <a href="mailto:info@cites.org" target="_top">info@cites.org</a>
+        <h2>2. EDITION</h2>
+        <p>Vous pouvez publier les Ressources en tout ou en partie, y compris en ligne, à condition que (a) les Ressources ne soient pas téléchargeables et (b) la source soit dûment et clairement mentionnée (voir la clause 5 ci-dessous). Assurez-vous que vous utilisez la version la plus récente des Ressources et que la date du téléchargement est visible dans la version publiée. Les Ressources publiées en ligne doivent indiquer un lien visible vers la source initiale en ligne (listedecontrôledesespéces.cites.org). Avant toute publication, nous vous recommandons vivement de soumettre les ressources utilisées au Secrétariat CITES pour examen. Les demandes d’autorisation, précisant l’objet et le but de la reproduction, devront être adressées au Secrétariat CITES, Maison internationale de l’environnement, 15 Chemin des Anémones, CH-1219 Châtelaine (Genève), Suisse ou par e-mail à <a href="mailto:info@cites.org" target="_top">info@cites.org</a>
         .</p>
 
-        <h2>3. NO SUB-LICENSING OR REDISTRIBUTION</h2>
-        <p>The Materials may not be sub-licensed in whole or in part including within Derivative Works without the prior written permission of the CITES Secretariat and UNEP. You may not redistribute the Materials in whole or in part by any means including (but not limited to) electronic formats such as web downloads, through web services, or through file transfer protocols. If you know of others who wish to use the Materials or if you wish to provide a service through which the Materials are downloadable or otherwise made available for redistribution you must contact 
-        <a href="mailto:info@cites.org" target="_top">info@cites.org</a> 
-        for permission and further guidance.</p>
+        <h2>3. PAS DE SOUS-TRAITANCE OU DE REDISTRIBUTION</h2>
+        <p>Les Ressources et Travaux Dérivés ne peuvent pas être sous-traités, en tout ou en partie, sans autorisation écrite du Secrétariat CITES ou du PNUE. Vous ne pouvez pas redistribuer les Ressources, en tout ou partie, par quelque moyen que ce soit, notamment (mais sans s’y limiter) les formats électroniques tels que téléchargements via un service web, ou via un protocole de transfert de fichiers. Si vous connaissez d’autres personnes qui souhaitent utiliser les Ressources ou fournir un service via lequel les Ressources sont téléchargeables ou simplement rendues disponibles à des fins de redistribution, veuillez contacter <a href="mailto:info@cites.org" target="_top">info@cites.org</a> pour obtenir une autorisation et plus de précisions.</p>
 
-        <h2>4. NO COMMERCIAL USE</h2>
-        <p>Neither (a) the Materials nor (b) any work derived from or based upon the Materials (“Derivative Works”) may be put to Commercial Use without the prior written permission of the CITES Secretariat and UNEP. For the purposes of these Terms and Conditions, “Commercial Use” means any use to generate revenue. 
-        To apply for permission for Commercial Use of the Materials please send an email to <a href="mailto:info@cites.org" target="_top">info@cites.org</a> 
-        outlining your needs.</p>
+        <h2>4. PAS D’UTILISATION COMMERCIALE</h2>
+        <p>Ni (a) les Ressources, ni (b) aucun travail dérivé des Ressources (« Travaux dérivés ») ou fondé sur elles ne peuvent être utilisés à des fins commerciales sans autorisation écrite préalable du Secrétariat CITES ou du PNUE. Dans les présentes Conditions d'utilisation, « Utilisation Commerciale » signifie toute utilisation visant à générer des revenus. Pour demander l'autorisation d’utiliser les Ressources à des fins commerciales, veuillez envoyer un courriel à l’adresse <a href="mailto:info@cites.org" target="_top">info@cites.org</a> en précisant votre demande.</p>
 
-        <h2>5. ATTRIBUTION</h2>
-        <p>You must ensure that the citation set out below is always clearly reproduced in any publication or analysis involving the CITES Checklist data, in any derived form or format:</p>
-        <p>UNEP-WCMC (Comps.) 2013. The Checklist of CITES Species Website. CITES Secretariat, Geneva, Switzerland. Compiled by UNEP-WCMC, Cambridge, UK. Available at: <a href="http://checklist.cites.org">http://checklist.cites.org</a>. [Accessed (please insert date of download dd/mm/yyyy)].</p>
+        <h2>5. MENTION LÉGALE</h2>
+        <p>Vous devez vous assurer que la mention ci-dessous soit toujours clairement mentionnée dans toute publication ou analyse utilisant les données de la Liste de contrôle CITES, sous quelque forme ou format que ce soit:
+        </p>
+        <p>PNUE-WCMC (Comps.) 2013. Site internet de la Liste de contrôle des espèces CITES. Secrétariat CITES, Genève, Suisse. Compilé par le PNUE-WCMC, Cambridge, R.-U. Disponible à l’adresse suivante:
+        PNUE-WCMC (Comps.) 2013. Site internet de la Liste de contrôle des espèces CITES. Secrétariat CITES, Genève, Suisse. Compilé par le PNUE-WCMC, Cambridge, R.-U. Disponible à l’adresse suivante: <a href="http://checklist.cites.org">http://checklist.cites.org</a>. [Consulté le (veuillez saisir la date du téléchargement jj/mm/aaaa)].</p>
 
-        <h2>6. NO GRANT OF INTELLECTUAL PROPERTY RIGHTS</h2>
-        <p>No rights in the Materials are granted to the User by virtue of these Terms and Conditions or as a result of any use of the Materials. </p>
+        <h2>6. NON-OCTROI DES DROITS DE PROPRIÉTÉ INTELLECTUELLE</h2>
+        <p>Les présentes Conditions d'utilisation ne confèrent à l'Utilisateur aucun droit sur les Ressources elles-mêmes ou résultant de l’utilisation desdites Ressources.</p>
 
-        <h2>7. NO WARRANTY AND WAIVER OF LIABILITY</h2>
-        <p>While the CITES Secretariat and UNEP strive to ensure accuracy and keep the Materials up-to-date, the Materials are provided to the User &#8216;as is&#8217; and no warranty of any kind is given as to its completeness or accuracy . All warranties, representations and conditions, express or implied, are hereby excluded to the fullest extent permitted. The User agrees to download and make use of the Materials entirely at his or her own risk. The User waives and releases the CITES Secretariat and UNEP from any liability whatsoever, wherever and howsoever arising in connection with any use of the Materials or Derivative Works. The CITES Secretariat and UNEP will not be liable on any grounds (including without limitation negligence, strict liability or under any other legal theory) for any loss or damage (direct or indirect) incurred by the User or any third party as a result of the use of the Materials or any Derivative Works. The User also indemnifies and holds harmless the CITES Secretariat and UNEP in respect of any loss or damage (direct or indirect) suffered by any third party as a result of any use by that third party of any Materials or Derivative Works published the User. Without limitation to the above, any damage occurring to computer systems as a result of attempts to download Materials is entirely the User’s responsibility.</p>
+        <h2>7. EXCLUSION DE GARANTIE ET DÉCHARGE DE RESPONSABILITÉ</h2>
+        <p>Bien que le Secrétariat CITES et le PNUE s'efforcent de veiller à l’exactitude et à la tenue à jour des Ressources, ces dernières sont fournies à l’Utilisateur 'en l'état', sans garantie d'aucune sorte quant à l'exhaustivité et l'exactitude des données. Nous excluons, par la présente, toute garantie, représentation et condition, expresse ou tacite, dans les limites autorisées par la loi. L’Utilisateur accepte de télécharger et d'utiliser les Ressources sous son entière responsabilité. L’Utilisateur renonce à toute réclamation et dégage le Secrétariat CITES et le PNUE de toute responsabilité, quelle qu'elle soit, découlant de l’utilisation des Ressources ou des Travaux Dérivés.
+        Le Secrétariat CITES et le PNUE ne pourront en aucun cas être tenus responsables, pour quelque motif que ce soit (y compris, sans limitation, en cas de négligence, responsabilité stricte ou en vertu de tout autre principe de droit) de toute perte ou tout préjudice (direct ou indirect) subis par l’Utilisateur ou un tiers et résultant de l’utilisation des Ressources ou de Travaux dérivés. L’Utilisateur s'engage à indemniser et dégage de toute responsabilité le Secrétariat CITES et le PNUE pour toute perte ou tout préjudice (direct ou indirect) subis par un tiers, résultant de l’utilisation par ledit tiers de toute donnée des Ressources ou de Travaux dérivés quels qu'ils soient publiés par l’Utilisateur. Sans limiter ce qui précède, tout dommage occasionné à un système informatique pouvant découler de tentatives de téléchargement des Ressources sera de la seule et entière responsabilité de l’Utilisateur. </p>
 
-        <h2>8. DISCLAIMERS</h2>
-        <p>The contents of this website do not necessarily reflect the views or policies of the CITES Secretariat and UNEP, contributory organisations or editors. The designations employed and the presentations of material in this report do not imply the expression of any opinion whatsoever on the part of the CITES Secretariat and UNEP or contributory organisations, editors or publishers concerning the legal status of any country or territory.</p>
+        <h2>8. CLAUSES DE NON-RESPONSABILITÉ</h2>
+        <p>Le contenu de ce site internet ne reflète pas nécessairement l'opinion ou la politique du Secrétariat CITES, du PNUE, des organisations participantes ou des rédacteurs. Les désignations employées ou les présentations exposées dans ce rapport ne sous-entendent aucunement l’expression d’une quelconque opinion de la part du Secrétariat CITES, du PNUE, des organisations participantes, des rédacteurs ou des éditeurs sur le statut légal d’un pays ou d’un territoire. </p>
 
-        <h2>9. FEEDBACK</h2>
-        <p>The User agrees to provide feedback on the quality, reliability and accuracy of the Materials where these may become apparent.</p>
+        <h2>9. RETOUR D'INFORMATION</h2>
+        <p>L’utilisateur accepte de faire part de ses commentaires sur la qualité, la fiabilité et l’exactitude des Ressources quand cela devient apparent.</p>
 
-        <h2>10. CHANGES TO THESE TERMS AND CONDITIONS</h2>
-        <p>The CITES Secretariat and UNEP reserve the right to vary these Terms and Conditions from time to time without notice. Therefore please ensure that you read these Terms and Conditions each time you download Materials. By downloading Materials you signify your acceptance of the most recent version of these Terms and Conditions in full.</p>
+        <h2>10. CHANGEMENTS DANS LES CONDITIONS</h2>
+        <p>Le Secrétariat CITES et le PNUE se réservent le droit de modifier ces Conditions à tout moment et sans avis. En conséquence, veuillez lire les Conditions à chaque fois que vous télécharger des Ressources. En téléchargeant des Ressources, acceptez d'être lié vous signifiez que vous acceptez l'intégralité de ces Conditions dans leur version la plus récente.</p>
 
-        <h2>11. DISPUTE RESOLUTION</h2>
-        <p>Any dispute arising out of or in connection with any use of the Materials shall be settled by amicable negotiation with the CITES Checklist suppliers. Should attempts at amicable negotiation fail, any such dispute shall, upon request by either the User or the CITES Checklist suppliers, be referred to arbitration in accordance with the UNCITRAL arbitration rules then prevailing.</p>
+        <h2>11. RÉSOLUTION DES LITIGES</h2>
+        <p>Tout conflit découlant directement ou indirectement de toute utilisation des Ressources sera être résolu par une négociation a l’amiable avec les fournisseurs de la Liste de contrôle des espèces CITES. Si la négociation à l’amiable échoue, ce différend devra, à la demande soit de l’Utilisateur, soit des fournisseurs de la Liste de contrôle des espèces CITES, faire l'objet d'une procédure d'arbitrage conformément au Règlement d'arbitrage en vigueur de la CNUDCI.</p>
 
         <h2>12. COMMUNICATION</h2>
-        <p>Any communication with respect to these Terms and Conditions and any issue arising from them shall be in writing, in English, and sent by email. The address for communication with the CITES Checklist supplier is <a href="mailto:info@cites.org" target="_top">info@cites.org</a> 
+        <p>Toute communication concernant les présentes Conditions et tout différend pouvant en découler sera faite par écrit en anglais, et envoyées par courriel. Pour toute communication avec les fournisseurs de la Liste de contrôle des espèces CITES, veuillez vous adresser à <a href="mailto:info@cites.org" target="_top">info@cites.org</a>
         .</p>
       </div>
     </div>

From 891cc7265c23f1943dc8634a5e881f38795dbdd2 Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Fri, 25 Jul 2014 11:12:48 +0100
Subject: [PATCH 40/58] terms page ES

---
 app/javascripts/locales/es.js        |  4 +-
 app/static/terms_of_use_page_es.html | 61 +++++++++++++---------------
 2 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/app/javascripts/locales/es.js b/app/javascripts/locales/es.js
index 1807951..fc2b8e5 100644
--- a/app/javascripts/locales/es.js
+++ b/app/javascripts/locales/es.js
@@ -1,9 +1,9 @@
 Em.I18n.locales.es = {
   'title': 'Lista de especies CITES',
   'about.title': 'Sobre la Lista de referencia CITES',
-  'terms.title': 'Condiciones de uso',
+  'terms.title': 'Términos de uso',
   'toplink.about': 'Acerca de',
-  'toplink.terms': 'Condiciones de uso',
+  'toplink.terms': 'Términos de uso',
   'powered.by': 'Proporcionada por',
 
   'search.by_taxon.button': 'BUSCAR',
diff --git a/app/static/terms_of_use_page_es.html b/app/static/terms_of_use_page_es.html
index b5e2b92..25df77f 100644
--- a/app/static/terms_of_use_page_es.html
+++ b/app/static/terms_of_use_page_es.html
@@ -1,53 +1,48 @@
 <div class="wrap">
   <div class="content">
     <div class="c1">
-        <h2>ES Terms and Conditions of Use of CITES Checklist Data</h2>
+        <h2>Términos y condiciones de uso de los datos de la Lista de referencia CITES</h2>
 
-        <h2>1. INTRODUCTION</h2>
-        <p>Access to the information, data and attribute data provided through CITES Checklist website (the "Materials") is provided to the User on the understanding that the User reads and consents to be bound to the Terms and Conditions set out below. For the purposes of this Agreement, Materials comprise all the species lists, checklists and other information made available for download and contained within any part of the CITES Checklist website.</p>
+        <h2>1. INTRODUCCIÓN</h2>
+        <p>Al Usuario se le proporciona acceso a la información, los datos y los datos de atributos a través del sitio web de la Lista de referencia CITES (los "Materiales") en el entendimiento de que el Usuario lee y acepta los Términos y Condiciones que se exponen más adelante. Para los fines de este Acuerdo, los Materiales comprenden todas las listas de especies, listas de referencia y otra información disponible para descargarla y contenida en cualquier parte del sitio web de la Lista de referencia CITES.</p>
 
-        <p class="strong">PLEASE READ THESE TERMS AND CONDITIONS CAREFULLY. IF YOU DO NOT AGREE TO ANY OF THE TERMS AND CONDITIONS, DO NOT DOWNLOAD. BY DOWNLOADING THE MATERIALS MADE AVAILABLE ON THE CITES CHECKLIST WEBSITE THE USER ACCEPTS AND AGREES TO COMPLY WITH THE TERMS AND CONDITIONS BELOW.</p>
+        <p class="strong">SÍRVASE LEER ESTOS TÉRMINOS Y CONDICIONES DETENIDAMENTE. SI NO ESTÁ DE ACUERDO CON CUALQUIERA DE ESTOS TÉRMINOS Y CONDICIONES, NO DESCARGUE. AL DESCARGAR LOS MATERIALES DISPONIBLES EN LA PÁGINA WEB DE LA LISTA DE REFERENCIA CITES, EL USUARIO ACEPTA LOS TÉRMINOS Y CONDICIONES EXPUESTOS A CONTINUACIÓN, Y SE COMPROMETE A CUMPLIRLOS.</p>
 
-        <h2>2. PUBLISHING</h2>
-        <p>You may publish the Materials in whole or in part, including on-line, providing (a) the Materials are not downloadable and (b) the proper attribution is clearly visible (see clause 5 below). You must ensure that the most recently available version of the Materials is being used and that the date of download is visible in the published version. Materials published online must provide a clear link to the original on-line source (checklist.cites.org). We strongly recommend that you have the relevant materials reviewed by the CITES Secretariat prior to publication. Applications for permission, with a statement of purpose and extent of reproduction, should be sent to the CITES Secretariat, International Environment House, 15, Chemin des Anémones, CH 1219 Châtelaine (Geneva), Switzerland or via email to
-          <a href="mailto:info@cites.org" target="_top">info@cites.org</a>
+        <h2>2. PUBLICACIÓN</h2>
+        <p>El Usuario puede publicar los Materiales total o parcialmente, inclusive en línea, siempre y cuando a) los Materiales no sean descargables, y b) la atribución correcta sea claramente visible (véase la cláusula 5 infra). Debe asegurarse de que usa la versión más reciente disponible de los Materiales y de que la fecha de descarga es visible en la versión publicada. Los materiales publicados en línea deben incluir un claro enlace con la fuente en línea original (checklist.cites.org). Recomendamos encarecidamente que los materiales pertinentes sean revisados por la Secretaría de la CITES antes de ser publicados. Las solicitudes de autorización, con una descripción del propósito y el alcance de la reproducción, deben ser enviadas a la Secretaría de la CITES, International Environment House, 15, Chemin des Anémones, CH 1219 Châtelaine (Ginebra, Suiza) o por correo electrónico a <a href="mailto:info@cites.org" target="_top">info@cites.org</a>
         .</p>
 
-        <h2>3. NO SUB-LICENSING OR REDISTRIBUTION</h2>
-        <p>The Materials may not be sub-licensed in whole or in part including within Derivative Works without the prior written permission of the CITES Secretariat and UNEP. You may not redistribute the Materials in whole or in part by any means including (but not limited to) electronic formats such as web downloads, through web services, or through file transfer protocols. If you know of others who wish to use the Materials or if you wish to provide a service through which the Materials are downloadable or otherwise made available for redistribution you must contact 
-        <a href="mailto:info@cites.org" target="_top">info@cites.org</a> 
-        for permission and further guidance.</p>
+        <h2>3. PROHIBICIÓN DE SUBLICENCIAS O REDISTRIBUCIÓN</h2>
+        <p>Los Materiales no pueden ser objeto de sublicencias total ni parcialmente, inclusive como parte de Trabajos Derivados, sin la autorización previa por escrito de la Secretaría de la CITES y del PNUMA. El Usuario no puede redistribuir los Materiales total ni parcialmente mediante ningún método, inclusive (pero sin limitarse a ellos) formatos electrónicos como descargas web, a través de servicios web, o mediante protocolos de transferencia de ficheros.
+        Si conoce a otras personas que deseen usar los Materiales o si desea proporcionar un servicio mediante el cual los Materiales se puedan descargar o poner a disposición por otros medios para redistribuirlos, tiene que ponerse en contacto con <a href="mailto:info@cites.org" target="_top">info@cites.org</a> para obtener autorización y más información.</p>
 
-        <h2>4. NO COMMERCIAL USE</h2>
-        <p>Neither (a) the Materials nor (b) any work derived from or based upon the Materials (“Derivative Works”) may be put to Commercial Use without the prior written permission of the CITES Secretariat and UNEP. For the purposes of these Terms and Conditions, “Commercial Use” means any use to generate revenue. 
-        To apply for permission for Commercial Use of the Materials please send an email to <a href="mailto:info@cites.org" target="_top">info@cites.org</a> 
-        outlining your needs.</p>
+        <h2>4. PROHIBICIÓN DE USO CON FINES COMERCIALES</h2>
+        <p>Ni a) los Materiales ni b) cualquier trabajo derivado de los Materiales o basado en ellos ("Trabajos Derivados") pueden ser usados con Fines Comerciales sin la autorización previa por escrito de la Secretaría de la CITES y el PNUMA. Para los fines de estos Términos y Condiciones, "Fines comerciales" significa cualquier uso para generar ganancias. Para solicitar autorización de uso con Fines Comerciales de los Materiales, sírvase enviar un correo electrónico a <a href="mailto:info@cites.org" target="_top">info@cites.org</a> indicando sus necesidades.</p>
 
-        <h2>5. ATTRIBUTION</h2>
-        <p>You must ensure that the citation set out below is always clearly reproduced in any publication or analysis involving the CITES Checklist data, in any derived form or format:</p>
-        <p>UNEP-WCMC (Comps.) 2013. The Checklist of CITES Species Website. CITES Secretariat, Geneva, Switzerland. Compiled by UNEP-WCMC, Cambridge, UK. Available at: <a href="http://checklist.cites.org">http://checklist.cites.org</a>. [Accessed (please insert date of download dd/mm/yyyy)].</p>
+        <h2>5. ATRIBUCIÓN</h2>
+        <p>Debe asegurarse de que la mención que figura infra se reproduce siempre claramente en toda publicación o todo análisis que contenga los datos de la Lista de referencia CITES, en cualquier forma o formato derivado:</p>
+        <p>UNEP-WCMC (Comps.) 2013. Página Web de la Lista de referencia CITES. Secretaría de la CITES, Ginebra, Suiza. Compilado por UNEP-WCMC, Cambridge, Reino Unido. Disponoble en: <a href="http://checklist.cites.org">http://checklist.cites.org</a>. [Acceso (sírvase insertar la fecha de descarga dd/mm/aaaa)].</p>
 
-        <h2>6. NO GRANT OF INTELLECTUAL PROPERTY RIGHTS</h2>
-        <p>No rights in the Materials are granted to the User by virtue of these Terms and Conditions or as a result of any use of the Materials. </p>
+        <h2>6. NO CONCESIÓN DE DERECHOS DE PROPIEDAD INTELECTUAL</h2>
+        <p>Al Usuario no se le concede ningún derecho en los Materiales en virtud de estos Términos y Condiciones ni como resultado de cualquier uso de los Materiales.</p>
 
-        <h2>7. NO WARRANTY AND WAIVER OF LIABILITY</h2>
-        <p>While the CITES Secretariat and UNEP strive to ensure accuracy and keep the Materials up-to-date, the Materials are provided to the User &#8216;as is&#8217; and no warranty of any kind is given as to its completeness or accuracy . All warranties, representations and conditions, express or implied, are hereby excluded to the fullest extent permitted. The User agrees to download and make use of the Materials entirely at his or her own risk. The User waives and releases the CITES Secretariat and UNEP from any liability whatsoever, wherever and howsoever arising in connection with any use of the Materials or Derivative Works. The CITES Secretariat and UNEP will not be liable on any grounds (including without limitation negligence, strict liability or under any other legal theory) for any loss or damage (direct or indirect) incurred by the User or any third party as a result of the use of the Materials or any Derivative Works. The User also indemnifies and holds harmless the CITES Secretariat and UNEP in respect of any loss or damage (direct or indirect) suffered by any third party as a result of any use by that third party of any Materials or Derivative Works published the User. Without limitation to the above, any damage occurring to computer systems as a result of attempts to download Materials is entirely the User’s responsibility.</p>
+        <h2>7. AUSENCIA DE GARANTÍA Y EXENCIÓN DE RESPONSABILIDAD</h2>
+        <p>Si bien la Secretaría de la CITES y el PNUMA se esfuerzan para asegurar la precisión y actualización de los Materiales, los Materiales se le proporcionan al Usuario ‘como están’ y no se ofrece ningún tipo de garantía sobre su integridad o precisión. Todas las garantías, representaciones y condiciones, expresas o implícitas, son excluidas por la presente en la mayor medida permitida. El Usuario acepta descargar y utilizar los Materiales completamente por su cuenta y riesgo. El Usuario exime a la Secretaría de la CITES y al PNUMA de toda responsabilidad, dondequiera y como quiera que surja en relación con el uso de los Materiales o Trabajos Derivados. La Secretaría de la CITES y el PNUMA no serán responsables por razón alguna (incluyendo sin limitación negligencia, responsabilidad estricta o cualquier otra teoría legal) de ninguna pérdida o daño (directos o indirectos) sufridos por el Usuario o cualquier tercera parte como resultado del uso de los Materiales o cualquier Trabajo Derivado. El Usuario también indemniza y exime de responsabilidad a la Secretaría de la CITES y al PNUMA en relación con todo daño o pérdida (directos o indirectos) sufridos por un tercero como resultado del uso por esa tercera parte de cualquiera de los Materiales o de los Trabajos Derivados publicados por el Usuario. Sin limitación de lo expuesto anteriormente, todo daño a sistemas informáticos como resultado de intentar descargar los Materiales es completamente responsabilidad del Usuario.</p>
 
-        <h2>8. DISCLAIMERS</h2>
-        <p>The contents of this website do not necessarily reflect the views or policies of the CITES Secretariat and UNEP, contributory organisations or editors. The designations employed and the presentations of material in this report do not imply the expression of any opinion whatsoever on the part of the CITES Secretariat and UNEP or contributory organisations, editors or publishers concerning the legal status of any country or territory.</p>
+        <h2>8. DESCARGO DE RESPONSABILIDAD</h2>
+        <p>Los contenidos de este sitio web no reflejan necesariamente las opiniones o políticas de la Secretaría de la CITES y el PNUMA, de organizaciones colaboradoras o de los editores. Las designaciones empleadas y las presentaciones del material en este informe no implican la expresión de opinión alguna por la Secretaría de la CITES ni el PNUMA o de organizaciones colaboradoras, editores o editoriales en relación con el estatus legal de ningún país ni territorio.</p>
 
-        <h2>9. FEEDBACK</h2>
-        <p>The User agrees to provide feedback on the quality, reliability and accuracy of the Materials where these may become apparent.</p>
+        <h2>9. COMENTARIOS</h2>
+        <p>El Usuario acepta proporcionar comentarios sobre la calidad, fiabilidad y precisión de los Materiales en los casos en que sea necesario.</p>
 
-        <h2>10. CHANGES TO THESE TERMS AND CONDITIONS</h2>
-        <p>The CITES Secretariat and UNEP reserve the right to vary these Terms and Conditions from time to time without notice. Therefore please ensure that you read these Terms and Conditions each time you download Materials. By downloading Materials you signify your acceptance of the most recent version of these Terms and Conditions in full.</p>
+        <h2>10. MODIFICACIÓN DE ESTOS TÉRMINOS Y CONDICIONES</h2>
+        <p>La Secretaría de la CITES y el PNUMA se reservan el derecho de modificar estos Términos y Condiciones de vez en cuando sin previo aviso. Por tanto, asegúrese de que lee estos Términos y Condiciones cada vez que descarga Materiales. Descargar los Materiales significa que se acepta sin reservas la versión más reciente de estos Términos y Condiciones.</p>
 
-        <h2>11. DISPUTE RESOLUTION</h2>
-        <p>Any dispute arising out of or in connection with any use of the Materials shall be settled by amicable negotiation with the CITES Checklist suppliers. Should attempts at amicable negotiation fail, any such dispute shall, upon request by either the User or the CITES Checklist suppliers, be referred to arbitration in accordance with the UNCITRAL arbitration rules then prevailing.</p>
+        <h2>11. RESOLUCIÓN DE CONTROVERSIAS</h2>
+        <p>Toda controversia que surja en relación con el uso de los Materiales se resolverá mediante negociación amistosa con los proveedores de la Lista de referencia CITES. Si fracasaran los intentos de negociación amistosa, la controversia, a petición del Usuario o de los proveedores de la Lista de referencia CITES, se someterá a arbitraje de acuerdo con las reglas de arbitraje de la CNUDMI vigentes. </p>
 
-        <h2>12. COMMUNICATION</h2>
-        <p>Any communication with respect to these Terms and Conditions and any issue arising from them shall be in writing, in English, and sent by email. The address for communication with the CITES Checklist supplier is <a href="mailto:info@cites.org" target="_top">info@cites.org</a> 
-        .</p>
+        <h2>12. COMUNICACIÓN</h2>
+        <p>Toda comunicación en relación con estos Términos y Condiciones y cualquier problema que surja con ellos se hará por escrito, en inglés, y se enviará por correo electrónico. La dirección para comunicarse con el proveedor de la Lista de referencia CITES es <a href="mailto:info@cites.org" target="_top">info@cites.org</a>.</p>
       </div>
     </div>
   </div>

From 6b600f21c71dfca7b72b3474711d398a77526f20 Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Fri, 25 Jul 2014 15:18:04 +0100
Subject: [PATCH 41/58] reconciled translation discrepancies

---
 app/javascripts/locales/es.js | 2 +-
 app/static/about_page_fr.html | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/javascripts/locales/es.js b/app/javascripts/locales/es.js
index fc2b8e5..491a453 100644
--- a/app/javascripts/locales/es.js
+++ b/app/javascripts/locales/es.js
@@ -1,6 +1,6 @@
 Em.I18n.locales.es = {
   'title': 'Lista de especies CITES',
-  'about.title': 'Sobre la Lista de referencia CITES',
+  'about.title': 'Acerca de la Lista de especies CITES',
   'terms.title': 'Términos de uso',
   'toplink.about': 'Acerca de',
   'toplink.terms': 'Términos de uso',
diff --git a/app/static/about_page_fr.html b/app/static/about_page_fr.html
index c434e90..11eeb98 100644
--- a/app/static/about_page_fr.html
+++ b/app/static/about_page_fr.html
@@ -25,11 +25,11 @@ <h2><a id="web-display">L’affichage web et le téléchargement de données</a>
         <p><span class="bold">Remarque sur les fichiers CSV:</span> Pour la première fois, les utilisateurs peuvent télécharger la liste officielle des espèces CITES dans un fichier CSV utilisable directement dans Excel. Les fichiers CSV téléchargeables sur ce site utilisent les virgules comme séparateur, ce qui peut poser des problèmes de compatibilité avec les paramètres régionaux de certains systèmes informatiques.</p>
 
         <p>
-        Le <span class="italic">Répertoire des espèces CITES</span> et les <span class="italic">Annales des inscriptions à la CITES</span> sont toujours disponibles, dans leur intégralité, sur le côté droit de la page web, sous l’onglet <b>&#8220;Options&#8221; </b>. Le <span class="italic">Répertoire des espèces CITES</span> peut aussi être téléchargé en entier en cliquant sur le bouton rouge &#8220;Télécharger&#8221;, si aucun filtre n’a été sélectionné.
+        Le <span class="italic">Répertoire des espèces CITES</span> et les <span class="italic">Annales des inscriptions à la CITES</span> sont toujours disponibles, dans leur intégralité, sur le côté droit de la page web, sous l’onglet <b>&#8220;Mentionné&#8221; </b>. Le <span class="italic">Répertoire des espèces CITES</span> peut aussi être téléchargé en entier en cliquant sur le bouton rouge &#8220;Télécharger&#8221;, si aucun filtre n’a été sélectionné.
         De plus les utilisateurs ont la possibilité de produire des versions personnalisées du <span class="italic">Répertoire des espèces CITES</span> en fonction de leur besoins. Ils peuvent, par exemple, filtrer par nom (y compris les taxons supérieurs), par annexe CITES ou par pays/territoire/région où l'espèce est présente (&#8220;tous les endroits&#8221;). Ces filtres permettent ensuite de filtrer les données affichées sur le site, de même que les données téléchargées à l'aide du bouton rouge &#8220;Télécharger&#8221;. Les utilisateurs peuvent ainsi visionner et télécharger des sous-ensembles de données.
         </p>
         <p>
-        <span class="bold">Remarque</span>: Les filtres par pays/territoire/région où l'espèce est présente recouvrent tous les taxons associés à cette entité géographique, y compris les taxons enregistrés comme éteints, introduits ou réintroduits dans cette zone. Les détails complets des caractéristiques de distribution sont disponibles au téléchargement dans fichier CSV compatible avec Excel. Ces filtres ne s'appliquent pas aux résultats des <span class="italic">Annales des inscriptions à la CITES</span>, disponibles uniquement en version complète via le lien &#8220;Annales des inscriptions&#8221; sous l’onglet <b>&#8220;Option&#8221;</b>.
+        <span class="bold">Remarque</span>: Les filtres par pays/territoire/région où l'espèce est présente recouvrent tous les taxons associés à cette entité géographique, y compris les taxons enregistrés comme éteints, introduits ou réintroduits dans cette zone. Les détails complets des caractéristiques de distribution sont disponibles au téléchargement dans fichier CSV compatible avec Excel. Ces filtres ne s'appliquent pas aux résultats des <span class="italic">Annales des inscriptions à la CITES</span>, disponibles uniquement en version complète via le lien &#8220;Annales des inscriptions&#8221; sous l’onglet <b>&#8220;Mentionné&#8221;</b>.
         </p>
         <h3 class="bold">Compatibilité du navigateur</h3>
         <p>Optimisé pour Internet Explorer 8,9 et 10, Firefox, Safari et Google Chrome, ce site ne s’affichera peut-être pas correctement dans les navigateurs plus anciens.</p>

From 159fc0dd5974e4cd2dc9cc561949feeaec62b46a Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Fri, 25 Jul 2014 15:42:46 +0100
Subject: [PATCH 42/58] switched language codes to 2-letter variety

---
 app/javascripts/locales/en.js | 6 +++---
 app/javascripts/locales/es.js | 6 +++---
 app/javascripts/locales/fr.js | 6 +++---
 app/static/about_page_en.html | 2 +-
 app/static/about_page_es.html | 2 +-
 app/static/about_page_fr.html | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/javascripts/locales/en.js b/app/javascripts/locales/en.js
index 3ccb5e2..5d05dd2 100644
--- a/app/javascripts/locales/en.js
+++ b/app/javascripts/locales/en.js
@@ -39,9 +39,9 @@ Em.I18n.locales.en = {
 
   'advanced.title': 'Advanced Options',
   'advanced.common_names': 'COMMON NAMES',
-  'advanced.common_names.en': 'ENG',
-  'advanced.common_names.es': 'SPA',
-  'advanced.common_names.fr': 'FRE',
+  'advanced.common_names.en': 'EN',
+  'advanced.common_names.es': 'ES',
+  'advanced.common_names.fr': 'FR',
   'advanced.online_view': 'Online view',
   'advanced.online_view.alphabetical': 'Alphabetical',
   'advanced.online_view.taxonomic': 'Taxonomic',
diff --git a/app/javascripts/locales/es.js b/app/javascripts/locales/es.js
index 491a453..8857fac 100644
--- a/app/javascripts/locales/es.js
+++ b/app/javascripts/locales/es.js
@@ -39,9 +39,9 @@ Em.I18n.locales.es = {
 
   'advanced.title': 'Opciones avanzadas',
   'advanced.common_names': 'NOMBRES COMUNES',
-  'advanced.common_names.en': 'ENG',
-  'advanced.common_names.es': 'SPA',
-  'advanced.common_names.fr': 'FRE',
+  'advanced.common_names.en': 'EN',
+  'advanced.common_names.es': 'ES',
+  'advanced.common_names.fr': 'FR',
   'advanced.online_view': 'Vista en línea',
   'advanced.online_view.alphabetical': 'Alfabética',
   'advanced.online_view.taxonomic': 'Taxonómica',
diff --git a/app/javascripts/locales/fr.js b/app/javascripts/locales/fr.js
index 960f219..462d26a 100644
--- a/app/javascripts/locales/fr.js
+++ b/app/javascripts/locales/fr.js
@@ -39,9 +39,9 @@ Em.I18n.locales.fr = {
 
   'advanced.title': 'Options avancées',
   'advanced.common_names': 'NOMS COMMUNS',
-  'advanced.common_names.en': 'Anglais',
-  'advanced.common_names.es': 'Espagnol',
-  'advanced.common_names.fr': 'Français',
+  'advanced.common_names.en': 'EN',
+  'advanced.common_names.es': 'ES',
+  'advanced.common_names.fr': 'FR',
   'advanced.online_view': 'Affichage en ligne',
   'advanced.online_view.alphabetical': 'Alphabétique',
   'advanced.online_view.taxonomic': 'Taxonomique',
diff --git a/app/static/about_page_en.html b/app/static/about_page_en.html
index a33019e..9f4ea09 100644
--- a/app/static/about_page_en.html
+++ b/app/static/about_page_en.html
@@ -59,7 +59,7 @@ <h2><a id="advanced-options">Advanced options:</a></h2>
         </p>
         <ul>
           <li>
-          <span class="bold">Common names:</span> By de-selecting &#8216;ENG&#8217;, &#8216;SPA&#8217;, and &#8216;FRE&#8217;, this will remove the English, Spanish and
+          <span class="bold">Common names:</span> By de-selecting &#8216;EN&#8217;, &#8216;ES&#8217;, and &#8216;FR&#8217;, this will remove the English, Spanish and
           French common names on both the web display and within the Index downloads accessible through the red &#8220;Download&#8221; button;
           </li>
           <li>
diff --git a/app/static/about_page_es.html b/app/static/about_page_es.html
index 6b466ab..5b79c9c 100644
--- a/app/static/about_page_es.html
+++ b/app/static/about_page_es.html
@@ -48,7 +48,7 @@ <h2><a id="advanced-options">Opciones avanzadas:</a></h2>
         </p>
         <ul>
           <li>
-          <span class="bold">Nombres comunes:</span> Desactivando la selección de &#8216;ENG&#8217;, &#8216;SPA&#8217; y &#8216;FRE&#8217;, se eliminarán los nombres comunes en inglés, español y francés tanto en la visualización en la web como en las descargas del Índice accesibles mediante el botón rojo &#8220;Descarga&#8221;;
+          <span class="bold">Nombres comunes:</span> Desactivando la selección de &#8216;EN&#8217;, &#8216;ES&#8217; y &#8216;FR&#8217;, se eliminarán los nombres comunes en inglés, español y francés tanto en la visualización en la web como en las descargas del Índice accesibles mediante el botón rojo &#8220;Descarga&#8221;;
           </li>
           <li>
             <span class="bold">Visualización en línea:</span> La selección &#8220;Alfabética&#8221; o &#8220;Taxonómica&#8221; afecta a la forma en que se organizan las entidades taxonómicas sólo en la visualización web. Los resultados PDF y csv siempre se organizarán alfabéticamente. La vista de &#8220;Apéndice&#8221;, cuando se selecciona, refleja la visualización de los Apéndices de la CITES, mostrando los taxa al nivel al que están incluidos en orden taxonómico. Por ejemplo, se incluirá &#8220;Felidade spp.&#8221; porque se aplica a la inclusión a nivel de familia, pero las especies dentro de Felidae incluidas a nivel de familia no aparecerían en la visualización web. Nota: las especies incluidas como parte de una inclusión a nivel superior no se podrían buscar si se ha elegido este formato.
diff --git a/app/static/about_page_fr.html b/app/static/about_page_fr.html
index 11eeb98..27652aa 100644
--- a/app/static/about_page_fr.html
+++ b/app/static/about_page_fr.html
@@ -40,7 +40,7 @@ <h2><a id="advanced-options">Options avancées:</a></h2>
         </p>
         <ul>
           <li>
-           <span class="bold">Noms communs:</span> En désactivant &#8216;ENG&#8217;, &#8216;SPA&#8217;, and &#8216;FRE&#8217;, vous supprimez les noms communs en anglais, espagnol et français dans l’affichage web mais aussi dans les téléchargements de l’Index accessibles via le bouton rouge &#8220;Télécharger&#8221;;
+           <span class="bold">Noms communs:</span> En désactivant &#8216;EN&#8217;, &#8216;ES&#8217;, and &#8216;FR&#8217;, vous supprimez les noms communs en anglais, espagnol et français dans l’affichage web mais aussi dans les téléchargements de l’Index accessibles via le bouton rouge &#8220;Télécharger&#8221;;
           </li>
           <li>
             <span class="bold">Visualisation en ligne:</span> En sélectionnant &#8220;Alphabétique&#8221; ou &#8220;Taxonomique&#8221;, vous modifiez uniquement la manière dont les entités taxonomiques sont classées dans l'affichage web. Les résultats en PDF et CSV sont toujours classés par ordre alphabétique. En sélectionnant visualiser &#8220;Annexes&#8221;, vous accéder aux annexes CITES dans leur intégralité, avec les taxons au niveau auquel ils sont classés dans l’ordre taxonomique. Par exemple, vous verrez apparaître &#8220;Felidae spp.&#8221; car il s'agit de l'inscription d'une famille, mais les espèces de la famille des Felidae n’apparaitront pas dans l’affichage web. NB: Vous ne trouverez pas d'espèces inscrites à un niveau taxonomique supérieur si vous sélectionnez ce format.

From 50b0d471b979043edfa719beb95ad9ad5972769b Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Fri, 25 Jul 2014 16:48:36 +0100
Subject: [PATCH 43/58] changed ES label on 'Save this' button

---
 app/javascripts/locales/es.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascripts/locales/es.js b/app/javascripts/locales/es.js
index 8857fac..d4ffe2e 100644
--- a/app/javascripts/locales/es.js
+++ b/app/javascripts/locales/es.js
@@ -65,7 +65,7 @@ Em.I18n.locales.es = {
   'download.remove': '¿Quitar?',
   'download.spinner': 'Descargando...',
 
-  'saved_search.button': 'GUARDAR ESTA',
+  'saved_search.button': 'GUARDAR ESTO',
   'saved_search.count.zero': '',
   'saved_search.count.one': '1 búsqueda guardada',
   'saved_search.count.other': '{{count}} búsquedas guardadas',

From a1e9712b8a7400e1089f2ca51e1ea6b7488bf2cf Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Mon, 28 Jul 2014 10:22:02 +0100
Subject: [PATCH 44/58] [PNUMA|PNUE]-WCMC -> UNEP-WCMC

---
 app/static/about_page_es.html        | 4 ++--
 app/static/about_page_fr.html        | 4 ++--
 app/static/terms_of_use_page_fr.html | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/static/about_page_es.html b/app/static/about_page_es.html
index 5b79c9c..c08f3ad 100644
--- a/app/static/about_page_es.html
+++ b/app/static/about_page_es.html
@@ -75,12 +75,12 @@ <h2><a id="timelines">Cronogramas:</a></h2>
 
         <h2><a id="standard-nomenclature">Referencias sobre nomenclatura normalizada utilizadas</a></h2>
         <p>
-        Los nombres taxonómicos que han sido adoptados oficialmente por la Conferencia de las Partes [vea la lista de referencias normalizadas en la <a href="http://www.cites.org/eng/res/12/12-11R16.php">Resolución Conf. 12.11 (Rev. CoP16)</a>] aparecen en negrita en la  <span class="italic">Lista</span>, por ejemplo, <span class="bold italic">Acinonyx jubatus</span> (el guepardo). Este es el caso para la mayoría de los taxa. Algunas veces, sin embargo, aún no se ha adoptado una referencia sobre nomenclatura normalizada para las especies que forman parte de una categoría taxonómica superior. En tales casos, se ha utilizado una referencia identificada por el PNUMA-WCMC. Los nombres de estos taxa no están en negrita, por ejemplo, <span class="italic">Tridacna maxima</span> (u otras especies de Tridacnidae), siguiendo el patrón de versiones anteriores impresas de la <span class="italic">Lista</span>.
+        Los nombres taxonómicos que han sido adoptados oficialmente por la Conferencia de las Partes [vea la lista de referencias normalizadas en la <a href="http://www.cites.org/eng/res/12/12-11R16.php">Resolución Conf. 12.11 (Rev. CoP16)</a>] aparecen en negrita en la  <span class="italic">Lista</span>, por ejemplo, <span class="bold italic">Acinonyx jubatus</span> (el guepardo). Este es el caso para la mayoría de los taxa. Algunas veces, sin embargo, aún no se ha adoptado una referencia sobre nomenclatura normalizada para las especies que forman parte de una categoría taxonómica superior. En tales casos, se ha utilizado una referencia identificada por el UNEP-WCMC. Los nombres de estos taxa no están en negrita, por ejemplo, <span class="italic">Tridacna maxima</span> (u otras especies de Tridacnidae), siguiendo el patrón de versiones anteriores impresas de la <span class="italic">Lista</span>.
         </p>
 
         <h2><a id="contributors">Colaboradores de la Lista de referencia CITES</a></h2>
         <p>
-        La lista de referencia CITES fue elaborada por el PNUMA-WCMC en nombre de la Secretaría de la CITES. Los fondos para mantener esta base de datos han procedido de varias fuentes, sobre la base de proyectos o de forma más extendida en el tiempo. Entre los patrocinadores actuales, que financian en parte el mantenimiento de los datos, figuran: WCMC (Reino Unido), la Unión Europea y la Secretaría de la CITES.
+        La lista de referencia CITES fue elaborada por el UNEP-WCMC en nombre de la Secretaría de la CITES. Los fondos para mantener esta base de datos han procedido de varias fuentes, sobre la base de proyectos o de forma más extendida en el tiempo. Entre los patrocinadores actuales, que financian en parte el mantenimiento de los datos, figuran: WCMC (Reino Unido), la Unión Europea y la Secretaría de la CITES.
         </p>
         <p>
         Este recurso de información es el resultado de colaboraciones de larga duración entre un gran número de científicos de todo el mundo y de muchas organizaciones cuya contribución se agradece sinceramente.
diff --git a/app/static/about_page_fr.html b/app/static/about_page_fr.html
index 27652aa..f22dc12 100644
--- a/app/static/about_page_fr.html
+++ b/app/static/about_page_fr.html
@@ -68,12 +68,12 @@ <h2><a id="timelines">Frise chronologique:</a></h2>
         <h2><a id="standard-nomenclature">Les références de nomenclature normalisées</a></h2>
         <p>Les noms taxonomiques qui ont été officiellement adoptés par la Conférence des Parties [voir la liste des références de nomenclature normalisées dans la
           <a href="http://www.cites.org/eng/res/12/12-11R16.php">Résolution Conf. 12.11 (Rev.CoP16)</a>] apparaissent en caractères gras dans la <span class="italic">Liste de contrôle</span>,
-          par exemple <span class="bold italic">Acinonyx jubatus</span> (le guépard). C’est le cas pour la plupart des taxons. Il arrive cependant qu'aucune référence de nomenclature normalisée n'ait été adoptée pour les espèces constituant un taxon supérieur. Dans ce cas, une référence définie par le PNUE-WCMC aura été utilisée. Le nom de ces taxons n'est pas inscrit en gras, par exemple <span class="italic">Tridacna maxima</span> (ou n’importe quelle espèce de Tridacnidae), comme dans les versions imprimées antérieures de la <span class="italic">Liste de contrôle</span>.
+          par exemple <span class="bold italic">Acinonyx jubatus</span> (le guépard). C’est le cas pour la plupart des taxons. Il arrive cependant qu'aucune référence de nomenclature normalisée n'ait été adoptée pour les espèces constituant un taxon supérieur. Dans ce cas, une référence définie par le UNEP-WCMC aura été utilisée. Le nom de ces taxons n'est pas inscrit en gras, par exemple <span class="italic">Tridacna maxima</span> (ou n’importe quelle espèce de Tridacnidae), comme dans les versions imprimées antérieures de la <span class="italic">Liste de contrôle</span>.
         </p>
 
         <h2><a id="contributors">Les bailleurs de fonds de la Liste de contrôle CITES</a></h2>
         <p>
-        La Liste de contrôle CITES a été mise au point par le PNUE-WCMC, pour le compte du Secrétariat CITES. La gestion de cette base de données est soutenue financièrement par de multiples partenaires, que ce soit dans le cadre d’un projet ou à plus long terme. Au nombre des bailleurs de fonds actuels figurent: le WCMC (Royaume-Uni), l’Union Européenne et le Secrétariat CITES.</p>
+        La Liste de contrôle CITES a été mise au point par le UNEP-WCMC, pour le compte du Secrétariat CITES. La gestion de cette base de données est soutenue financièrement par de multiples partenaires, que ce soit dans le cadre d’un projet ou à plus long terme. Au nombre des bailleurs de fonds actuels figurent: le WCMC (Royaume-Uni), l’Union Européenne et le Secrétariat CITES.</p>
         <p>
         Cette source d’information est le fruit d’une longue collaboration entre d’innombrables scientifiques du monde entier et de nombreuses organisations, dont la contribution est vivement appréciée.
         </p>
diff --git a/app/static/terms_of_use_page_fr.html b/app/static/terms_of_use_page_fr.html
index e20ed43..eeee201 100644
--- a/app/static/terms_of_use_page_fr.html
+++ b/app/static/terms_of_use_page_fr.html
@@ -21,8 +21,8 @@ <h2>4. PAS D’UTILISATION COMMERCIALE</h2>
         <h2>5. MENTION LÉGALE</h2>
         <p>Vous devez vous assurer que la mention ci-dessous soit toujours clairement mentionnée dans toute publication ou analyse utilisant les données de la Liste de contrôle CITES, sous quelque forme ou format que ce soit:
         </p>
-        <p>PNUE-WCMC (Comps.) 2013. Site internet de la Liste de contrôle des espèces CITES. Secrétariat CITES, Genève, Suisse. Compilé par le PNUE-WCMC, Cambridge, R.-U. Disponible à l’adresse suivante:
-        PNUE-WCMC (Comps.) 2013. Site internet de la Liste de contrôle des espèces CITES. Secrétariat CITES, Genève, Suisse. Compilé par le PNUE-WCMC, Cambridge, R.-U. Disponible à l’adresse suivante: <a href="http://checklist.cites.org">http://checklist.cites.org</a>. [Consulté le (veuillez saisir la date du téléchargement jj/mm/aaaa)].</p>
+        <p>UNEP-WCMC (Comps.) 2013. Site internet de la Liste de contrôle des espèces CITES. Secrétariat CITES, Genève, Suisse. Compilé par le UNEP-WCMC, Cambridge, R.-U. Disponible à l’adresse suivante:
+        UNEP-WCMC (Comps.) 2013. Site internet de la Liste de contrôle des espèces CITES. Secrétariat CITES, Genève, Suisse. Compilé par le UNEP-WCMC, Cambridge, R.-U. Disponible à l’adresse suivante: <a href="http://checklist.cites.org">http://checklist.cites.org</a>. [Consulté le (veuillez saisir la date du téléchargement jj/mm/aaaa)].</p>
 
         <h2>6. NON-OCTROI DES DROITS DE PROPRIÉTÉ INTELLECTUELLE</h2>
         <p>Les présentes Conditions d'utilisation ne confèrent à l'Utilisateur aucun droit sur les Ressources elles-mêmes ou résultant de l’utilisation desdites Ressources.</p>

From dd8febca568422773e4e7a3ee18a85ae6b0526f3 Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Mon, 28 Jul 2014 10:27:18 +0100
Subject: [PATCH 45/58] WCMC (UK)

---
 app/static/about_page_es.html        | 2 +-
 app/static/about_page_fr.html        | 2 +-
 app/static/terms_of_use_page_fr.html | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/static/about_page_es.html b/app/static/about_page_es.html
index c08f3ad..b421e2a 100644
--- a/app/static/about_page_es.html
+++ b/app/static/about_page_es.html
@@ -80,7 +80,7 @@ <h2><a id="standard-nomenclature">Referencias sobre nomenclatura normalizada uti
 
         <h2><a id="contributors">Colaboradores de la Lista de referencia CITES</a></h2>
         <p>
-        La lista de referencia CITES fue elaborada por el UNEP-WCMC en nombre de la Secretaría de la CITES. Los fondos para mantener esta base de datos han procedido de varias fuentes, sobre la base de proyectos o de forma más extendida en el tiempo. Entre los patrocinadores actuales, que financian en parte el mantenimiento de los datos, figuran: WCMC (Reino Unido), la Unión Europea y la Secretaría de la CITES.
+        La lista de referencia CITES fue elaborada por el UNEP-WCMC en nombre de la Secretaría de la CITES. Los fondos para mantener esta base de datos han procedido de varias fuentes, sobre la base de proyectos o de forma más extendida en el tiempo. Entre los patrocinadores actuales, que financian en parte el mantenimiento de los datos, figuran: WCMC (UK), la Unión Europea y la Secretaría de la CITES.
         </p>
         <p>
         Este recurso de información es el resultado de colaboraciones de larga duración entre un gran número de científicos de todo el mundo y de muchas organizaciones cuya contribución se agradece sinceramente.
diff --git a/app/static/about_page_fr.html b/app/static/about_page_fr.html
index f22dc12..1340d3e 100644
--- a/app/static/about_page_fr.html
+++ b/app/static/about_page_fr.html
@@ -73,7 +73,7 @@ <h2><a id="standard-nomenclature">Les références de nomenclature normalisées<
 
         <h2><a id="contributors">Les bailleurs de fonds de la Liste de contrôle CITES</a></h2>
         <p>
-        La Liste de contrôle CITES a été mise au point par le UNEP-WCMC, pour le compte du Secrétariat CITES. La gestion de cette base de données est soutenue financièrement par de multiples partenaires, que ce soit dans le cadre d’un projet ou à plus long terme. Au nombre des bailleurs de fonds actuels figurent: le WCMC (Royaume-Uni), l’Union Européenne et le Secrétariat CITES.</p>
+        La Liste de contrôle CITES a été mise au point par le UNEP-WCMC, pour le compte du Secrétariat CITES. La gestion de cette base de données est soutenue financièrement par de multiples partenaires, que ce soit dans le cadre d’un projet ou à plus long terme. Au nombre des bailleurs de fonds actuels figurent: le WCMC (UK), l’Union Européenne et le Secrétariat CITES.</p>
         <p>
         Cette source d’information est le fruit d’une longue collaboration entre d’innombrables scientifiques du monde entier et de nombreuses organisations, dont la contribution est vivement appréciée.
         </p>
diff --git a/app/static/terms_of_use_page_fr.html b/app/static/terms_of_use_page_fr.html
index eeee201..70d6b6d 100644
--- a/app/static/terms_of_use_page_fr.html
+++ b/app/static/terms_of_use_page_fr.html
@@ -21,8 +21,7 @@ <h2>4. PAS D’UTILISATION COMMERCIALE</h2>
         <h2>5. MENTION LÉGALE</h2>
         <p>Vous devez vous assurer que la mention ci-dessous soit toujours clairement mentionnée dans toute publication ou analyse utilisant les données de la Liste de contrôle CITES, sous quelque forme ou format que ce soit:
         </p>
-        <p>UNEP-WCMC (Comps.) 2013. Site internet de la Liste de contrôle des espèces CITES. Secrétariat CITES, Genève, Suisse. Compilé par le UNEP-WCMC, Cambridge, R.-U. Disponible à l’adresse suivante:
-        UNEP-WCMC (Comps.) 2013. Site internet de la Liste de contrôle des espèces CITES. Secrétariat CITES, Genève, Suisse. Compilé par le UNEP-WCMC, Cambridge, R.-U. Disponible à l’adresse suivante: <a href="http://checklist.cites.org">http://checklist.cites.org</a>. [Consulté le (veuillez saisir la date du téléchargement jj/mm/aaaa)].</p>
+        <p>UNEP-WCMC (Comps.) 2013. Site internet de la Liste de contrôle des espèces CITES. Secrétariat CITES, Genève, Suisse. Compilé par le UNEP-WCMC, Cambridge, R.-U. Disponible à l’adresse suivante: <a href="http://checklist.cites.org">http://checklist.cites.org</a>. [Consulté le (veuillez saisir la date du téléchargement jj/mm/aaaa)].</p>
 
         <h2>6. NON-OCTROI DES DROITS DE PROPRIÉTÉ INTELLECTUELLE</h2>
         <p>Les présentes Conditions d'utilisation ne confèrent à l'Utilisateur aucun droit sur les Ressources elles-mêmes ou résultant de l’utilisation desdites Ressources.</p>

From d3a8764d87bb8f05cdd4a72979a9466ceec9afdf Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Mon, 28 Jul 2014 13:26:58 +0100
Subject: [PATCH 46/58] updated links to language versions of the resolution

---
 app/static/about_page_es.html | 4 ++--
 app/static/about_page_fr.html | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/static/about_page_es.html b/app/static/about_page_es.html
index b421e2a..c779d18 100644
--- a/app/static/about_page_es.html
+++ b/app/static/about_page_es.html
@@ -4,7 +4,7 @@
       <div class="content-left">
         <h2><a id="cites-checklist">Lista de referencia CITES</a></h2>
         <p>
-        La <span class="bold">Lista de referencia de Especies CITES</span> es la lista oficial de las especies incluidas en los Apéndices de la CITES (nombres científicos) y sus sinónimos científicos asociados, así como los nombres comunes en inglés, francés y español (cuando se dispone de ellos) y el Apéndice de la CITES en el que están incluidas actualmente (véase la <a href="http://www.cites.org/eng/res/12/12-11R16.php">Resolución Conf. 12.11 (Rev. CoP16)</a>).
+        La <span class="bold">Lista de referencia de Especies CITES</span> es la lista oficial de las especies incluidas en los Apéndices de la CITES (nombres científicos) y sus sinónimos científicos asociados, así como los nombres comunes en inglés, francés y español (cuando se dispone de ellos) y el Apéndice de la CITES en el que están incluidas actualmente (véase la <a href="http://www.cites.org/esp/res/12/12-11R16.php">Resolución Conf. 12.11 (Rev. CoP16)</a>).
         En este sitio web también se dispone de información sobre las inclusiones históricas en los Apéndices, las reservas y el nivel de las inclusiones (por ejemplo, si están incluidos una familia o un orden completos).
         </p>
 
@@ -75,7 +75,7 @@ <h2><a id="timelines">Cronogramas:</a></h2>
 
         <h2><a id="standard-nomenclature">Referencias sobre nomenclatura normalizada utilizadas</a></h2>
         <p>
-        Los nombres taxonómicos que han sido adoptados oficialmente por la Conferencia de las Partes [vea la lista de referencias normalizadas en la <a href="http://www.cites.org/eng/res/12/12-11R16.php">Resolución Conf. 12.11 (Rev. CoP16)</a>] aparecen en negrita en la  <span class="italic">Lista</span>, por ejemplo, <span class="bold italic">Acinonyx jubatus</span> (el guepardo). Este es el caso para la mayoría de los taxa. Algunas veces, sin embargo, aún no se ha adoptado una referencia sobre nomenclatura normalizada para las especies que forman parte de una categoría taxonómica superior. En tales casos, se ha utilizado una referencia identificada por el UNEP-WCMC. Los nombres de estos taxa no están en negrita, por ejemplo, <span class="italic">Tridacna maxima</span> (u otras especies de Tridacnidae), siguiendo el patrón de versiones anteriores impresas de la <span class="italic">Lista</span>.
+        Los nombres taxonómicos que han sido adoptados oficialmente por la Conferencia de las Partes [vea la lista de referencias normalizadas en la <a href="http://www.cites.org/esp/res/12/12-11R16.php">Resolución Conf. 12.11 (Rev. CoP16)</a>] aparecen en negrita en la  <span class="italic">Lista</span>, por ejemplo, <span class="bold italic">Acinonyx jubatus</span> (el guepardo). Este es el caso para la mayoría de los taxa. Algunas veces, sin embargo, aún no se ha adoptado una referencia sobre nomenclatura normalizada para las especies que forman parte de una categoría taxonómica superior. En tales casos, se ha utilizado una referencia identificada por el UNEP-WCMC. Los nombres de estos taxa no están en negrita, por ejemplo, <span class="italic">Tridacna maxima</span> (u otras especies de Tridacnidae), siguiendo el patrón de versiones anteriores impresas de la <span class="italic">Lista</span>.
         </p>
 
         <h2><a id="contributors">Colaboradores de la Lista de referencia CITES</a></h2>
diff --git a/app/static/about_page_fr.html b/app/static/about_page_fr.html
index 1340d3e..34c4329 100644
--- a/app/static/about_page_fr.html
+++ b/app/static/about_page_fr.html
@@ -4,7 +4,7 @@
       <div class="content-left">
         <h2><a id="cites-checklist">La liste de contrôle CITES</a></h2>
         <p>
-        La <span class="bold">Liste de contrôle des espèces CITES</span> est la liste officielle des espèces CITES (sous leurs noms scientifiques), de leurs synonymes scientifiques, de leurs noms communs en anglais, français et espagnol (dans la mesure où ils sont disponibles) avec l'indication de l'annexe à laquelle elles sont inscrites [voir la <a href="http://www.cites.org/eng/res/12/12-11R16.php">Résolution 12.11 (Rev Cop16)</a>].
+        La <span class="bold">Liste de contrôle des espèces CITES</span> est la liste officielle des espèces CITES (sous leurs noms scientifiques), de leurs synonymes scientifiques, de leurs noms communs en anglais, français et espagnol (dans la mesure où ils sont disponibles) avec l'indication de l'annexe à laquelle elles sont inscrites [voir la <a href="http://www.cites.org/fra/res/12/12-11R16.php">Résolution 12.11 (Rev Cop16)</a>].
         Des informations sur l’historique des inscriptions aux annexes, sur les réserves, et le niveau taxonomique d'inscription aux annexes (par exemple, l'ensemble d'une famille ou d'un groupe) sont également disponibles sur le présent site web.
         </p>
 
@@ -67,7 +67,7 @@ <h2><a id="timelines">Frise chronologique:</a></h2>
 
         <h2><a id="standard-nomenclature">Les références de nomenclature normalisées</a></h2>
         <p>Les noms taxonomiques qui ont été officiellement adoptés par la Conférence des Parties [voir la liste des références de nomenclature normalisées dans la
-          <a href="http://www.cites.org/eng/res/12/12-11R16.php">Résolution Conf. 12.11 (Rev.CoP16)</a>] apparaissent en caractères gras dans la <span class="italic">Liste de contrôle</span>,
+          <a href="http://www.cites.org/fra/res/12/12-11R16.php">Résolution Conf. 12.11 (Rev.CoP16)</a>] apparaissent en caractères gras dans la <span class="italic">Liste de contrôle</span>,
           par exemple <span class="bold italic">Acinonyx jubatus</span> (le guépard). C’est le cas pour la plupart des taxons. Il arrive cependant qu'aucune référence de nomenclature normalisée n'ait été adoptée pour les espèces constituant un taxon supérieur. Dans ce cas, une référence définie par le UNEP-WCMC aura été utilisée. Le nom de ces taxons n'est pas inscrit en gras, par exemple <span class="italic">Tridacna maxima</span> (ou n’importe quelle espèce de Tridacnidae), comme dans les versions imprimées antérieures de la <span class="italic">Liste de contrôle</span>.
         </p>
 

From 272312dbe8427d1ea667c126a8d2557d8ad22062 Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Mon, 28 Jul 2014 13:28:40 +0100
Subject: [PATCH 47/58] small text change to do with distributions in CSV

---
 app/static/about_page_es.html | 2 +-
 app/static/about_page_fr.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/static/about_page_es.html b/app/static/about_page_es.html
index c779d18..fdf4ee4 100644
--- a/app/static/about_page_es.html
+++ b/app/static/about_page_es.html
@@ -35,7 +35,7 @@ <h2><a id="web-display">Visualización en la web y descargas de datos</a></h2>
           Estos filtros filtrarán luego los datos mostrados en el sitio web, además de los datos descargados mediante el botón rojo &#8220;Descarga&#8221;, para que los usuarios puedan ver y descargar subconjuntos de datos más reducidos.
         </p>
         <p>
-        <span class="bold">Nota</span>: Los filtros para el país/territorio/región de distribución incluyen todos los taxa asociados con esa entidad geográfica, comprendidos los taxa regisrados como extinguidos, introducidos o reintroducidos en esa área. Los detalles completos de estos atributos de distribución están disponibles en las descargas csv compatibles con Excel. Los filtros no se pueden aplicar a los resultados de la <span class="italic">Historia de las inclusiones en los Apéndices de la CITES</span>, de los que sólo se dispone de forma completa a través del vínculo &#8220;Historia de las inclusiones&#8221; bajo <b>&#8220;Destacados&#8221; </b>.
+        <span class="bold">Nota</span>: Los filtros para el país/territorio/región de distribución incluyen todos los taxa asociados con esa entidad geográfica, comprendidos los taxa regisrados como extinguidos, introducidos o reintroducidos en esa área. Todos los detalles de estos atributos de distribución están disponibles en las descargas csv compatibles con Excel. Los filtros no se pueden aplicar a los resultados de la <span class="italic">Historia de las inclusiones en los Apéndices de la CITES</span>, de los que sólo se dispone de forma completa a través del vínculo &#8220;Historia de las inclusiones&#8221; bajo <b>&#8220;Destacados&#8221; </b>.
         </p>
         <h3 class="bold">Compatibilidad de navegador</h3>
         <p>
diff --git a/app/static/about_page_fr.html b/app/static/about_page_fr.html
index 34c4329..29c8569 100644
--- a/app/static/about_page_fr.html
+++ b/app/static/about_page_fr.html
@@ -29,7 +29,7 @@ <h2><a id="web-display">L’affichage web et le téléchargement de données</a>
         De plus les utilisateurs ont la possibilité de produire des versions personnalisées du <span class="italic">Répertoire des espèces CITES</span> en fonction de leur besoins. Ils peuvent, par exemple, filtrer par nom (y compris les taxons supérieurs), par annexe CITES ou par pays/territoire/région où l'espèce est présente (&#8220;tous les endroits&#8221;). Ces filtres permettent ensuite de filtrer les données affichées sur le site, de même que les données téléchargées à l'aide du bouton rouge &#8220;Télécharger&#8221;. Les utilisateurs peuvent ainsi visionner et télécharger des sous-ensembles de données.
         </p>
         <p>
-        <span class="bold">Remarque</span>: Les filtres par pays/territoire/région où l'espèce est présente recouvrent tous les taxons associés à cette entité géographique, y compris les taxons enregistrés comme éteints, introduits ou réintroduits dans cette zone. Les détails complets des caractéristiques de distribution sont disponibles au téléchargement dans fichier CSV compatible avec Excel. Ces filtres ne s'appliquent pas aux résultats des <span class="italic">Annales des inscriptions à la CITES</span>, disponibles uniquement en version complète via le lien &#8220;Annales des inscriptions&#8221; sous l’onglet <b>&#8220;Mentionné&#8221;</b>.
+        <span class="bold">Remarque</span>: Les filtres par pays/territoire/région où l'espèce est présente recouvrent tous les taxons associés à cette entité géographique, y compris les taxons enregistrés comme éteints, introduits ou réintroduits dans cette zone. Ces caractéristiques de distribution sont indiquées en détail dans les fichiers CSV compatibles Excel téléchargés. Ces filtres ne s'appliquent pas aux résultats des <span class="italic">Annales des inscriptions à la CITES</span>, disponibles uniquement en version complète via le lien &#8220;Annales des inscriptions&#8221; sous l’onglet <b>&#8220;Mentionné&#8221;</b>.
         </p>
         <h3 class="bold">Compatibilité du navigateur</h3>
         <p>Optimisé pour Internet Explorer 8,9 et 10, Firefox, Safari et Google Chrome, ce site ne s’affichera peut-être pas correctement dans les navigateurs plus anciens.</p>

From a0be5b80852ea7abbe8b9bcb1c131047a6227797 Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Mon, 28 Jul 2014 14:01:06 +0100
Subject: [PATCH 48/58] fixed hover behaviour for appendig and location buttons

---
 app/stylesheets/checklist.scss | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/stylesheets/checklist.scss b/app/stylesheets/checklist.scss
index 014fcaf..d51240d 100644
--- a/app/stylesheets/checklist.scss
+++ b/app/stylesheets/checklist.scss
@@ -1000,18 +1000,22 @@ ul.quick-links {
     }
 
     .btn{
-      display:inline-block;
-      color:#fff;
-      margin:4px 0;
-      line-height:12px;
-      font-size:12px;
-      font-weight:bold;
-      text-align:center;
-      padding:5px 12px;
+      background: none repeat scroll 0 0 #33536a;
+      border-radius: 15px;
+      color: #fff;
+      display: inline-block;
+      font-size: 13px;
+      font-weight: bold;
+      line-height: 14px;
       overflow: hidden;
+      padding: 5px 12px;
+      text-align: center;
+      vertical-align: middle;
 
       span{
-        display:block;
+        display:table-cell;
+        vertical-align: middle;
+        height: 24px;
         padding:0 15px 0 0;
         background:url(../images/down-arrow.png) no-repeat 100% 50%;
       }
@@ -1023,10 +1027,6 @@ ul.quick-links {
       text-decoration:none;
     }
     .btn-wrapper {
-      border-radius: 15px;
-      -moz-border-radius: 15px;
-      -webkit-border-radius: 15px;
-      background:#33536a;
       vertical-align:middle;
       margin:4px 0;
     }

From bac70a26d71ddfaa4970bdf0e855924738894d30 Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Mon, 28 Jul 2014 15:08:56 +0100
Subject: [PATCH 49/58] [#75587748] fixed French & Spanish Checklist titles

---
 app/javascripts/locales/fr.js        |  6 +++---
 app/static/about_page_es.html        | 14 +++++++-------
 app/static/about_page_fr.html        | 18 +++++++++---------
 app/static/terms_of_use_page_es.html | 12 ++++++------
 app/static/terms_of_use_page_fr.html | 12 ++++++------
 5 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/app/javascripts/locales/fr.js b/app/javascripts/locales/fr.js
index 462d26a..ea55d3a 100644
--- a/app/javascripts/locales/fr.js
+++ b/app/javascripts/locales/fr.js
@@ -1,6 +1,6 @@
 Em.I18n.locales.fr = {
-  'title': 'Liste de contrôle des espèces CITES',
-  'about.title': 'A propos de la liste de contrôle CITES',
+  'title': 'Liste des espèces CITES',
+  'about.title': 'A propos de la Liste des espèces CITES',
   'terms.title': 'Conditions d\'utilisation',
   'toplink.about': 'A propos de',
   'toplink.terms': 'Conditions d\'utilisation',
@@ -92,7 +92,7 @@ Em.I18n.locales.fr = {
   'reports.failed.count.other': 'Echec de {{count}} rapports',
 
   'reports.failed.description': 'Vous pouvez relancer un téléchargement, ou le supprimer de la liste',
-  'reports.generating.description': 'Cela peut prendre du temps, mais vous pouvez fermer cette fenêtre et continuer de travailler à d\'autres rapports sur les Listes de contrôle CITES',
+  'reports.generating.description': 'Cela peut prendre du temps, mais vous pouvez fermer cette fenêtre et continuer de travailler à d\'autres rapports sur les Listes des espèces CITES',
 
   'reports.ready.title': 'Vos rapports',
   'reports.generating.title': 'Rapports en cours de production',
diff --git a/app/static/about_page_es.html b/app/static/about_page_es.html
index fdf4ee4..a469cdb 100644
--- a/app/static/about_page_es.html
+++ b/app/static/about_page_es.html
@@ -2,9 +2,9 @@
   <div class="content">
     <div class="c1">
       <div class="content-left">
-        <h2><a id="cites-checklist">Lista de referencia CITES</a></h2>
+        <h2><a id="cites-checklist">Lista de especies CITES</a></h2>
         <p>
-        La <span class="bold">Lista de referencia de Especies CITES</span> es la lista oficial de las especies incluidas en los Apéndices de la CITES (nombres científicos) y sus sinónimos científicos asociados, así como los nombres comunes en inglés, francés y español (cuando se dispone de ellos) y el Apéndice de la CITES en el que están incluidas actualmente (véase la <a href="http://www.cites.org/esp/res/12/12-11R16.php">Resolución Conf. 12.11 (Rev. CoP16)</a>).
+        La <span class="bold">Lista de especies CITES</span> es la lista oficial de las especies incluidas en los Apéndices de la CITES (nombres científicos) y sus sinónimos científicos asociados, así como los nombres comunes en inglés, francés y español (cuando se dispone de ellos) y el Apéndice de la CITES en el que están incluidas actualmente (véase la <a href="http://www.cites.org/esp/res/12/12-11R16.php">Resolución Conf. 12.11 (Rev. CoP16)</a>).
         En este sitio web también se dispone de información sobre las inclusiones históricas en los Apéndices, las reservas y el nivel de las inclusiones (por ejemplo, si están incluidos una familia o un orden completos).
         </p>
 
@@ -44,7 +44,7 @@ <h3 class="bold">Compatibilidad de navegador</h3>
 
         <h2><a id="advanced-options">Opciones avanzadas:</a></h2>
         <p>
-        Bajo &#8220;Opciones avanzadas&#8221;, los usuarios pueden ajustar las visualizaciones en la web y los resultados de la Lista de referencia como sigue:
+        Bajo &#8220;Opciones avanzadas&#8221;, los usuarios pueden ajustar las visualizaciones en la web y los resultados de la Lista de especies como sigue:
         </p>
         <ul>
           <li>
@@ -78,9 +78,9 @@ <h2><a id="standard-nomenclature">Referencias sobre nomenclatura normalizada uti
         Los nombres taxonómicos que han sido adoptados oficialmente por la Conferencia de las Partes [vea la lista de referencias normalizadas en la <a href="http://www.cites.org/esp/res/12/12-11R16.php">Resolución Conf. 12.11 (Rev. CoP16)</a>] aparecen en negrita en la  <span class="italic">Lista</span>, por ejemplo, <span class="bold italic">Acinonyx jubatus</span> (el guepardo). Este es el caso para la mayoría de los taxa. Algunas veces, sin embargo, aún no se ha adoptado una referencia sobre nomenclatura normalizada para las especies que forman parte de una categoría taxonómica superior. En tales casos, se ha utilizado una referencia identificada por el UNEP-WCMC. Los nombres de estos taxa no están en negrita, por ejemplo, <span class="italic">Tridacna maxima</span> (u otras especies de Tridacnidae), siguiendo el patrón de versiones anteriores impresas de la <span class="italic">Lista</span>.
         </p>
 
-        <h2><a id="contributors">Colaboradores de la Lista de referencia CITES</a></h2>
+        <h2><a id="contributors">Colaboradores de la Lista de especies CITES</a></h2>
         <p>
-        La lista de referencia CITES fue elaborada por el UNEP-WCMC en nombre de la Secretaría de la CITES. Los fondos para mantener esta base de datos han procedido de varias fuentes, sobre la base de proyectos o de forma más extendida en el tiempo. Entre los patrocinadores actuales, que financian en parte el mantenimiento de los datos, figuran: WCMC (UK), la Unión Europea y la Secretaría de la CITES.
+        La Lista de especies CITES fue elaborada por el UNEP-WCMC en nombre de la Secretaría de la CITES. Los fondos para mantener esta base de datos han procedido de varias fuentes, sobre la base de proyectos o de forma más extendida en el tiempo. Entre los patrocinadores actuales, que financian en parte el mantenimiento de los datos, figuran: WCMC (UK), la Unión Europea y la Secretaría de la CITES.
         </p>
         <p>
         Este recurso de información es el resultado de colaboraciones de larga duración entre un gran número de científicos de todo el mundo y de muchas organizaciones cuya contribución se agradece sinceramente.
@@ -112,12 +112,12 @@ <h2><a id="contact">Contacto</a></h2>
       </div>
       <div class="menu-right">
         <ul>
-          <li><a href="#cites-checklist" class="scroll-to">Lista de referencia CITES</a></li>
+          <li><a href="#cites-checklist" class="scroll-to">Lista de especies CITES</a></li>
           <li><a href="#web-display" class="scroll-to">Visualización en la web y descargas de datos</a></li>
           <li><a href="#advanced-options" class="scroll-to">Opciones avanzadas</a></li>
           <li><a href="#timelines" class="scroll-to">Cronogramas</a></li>
           <li><a href="#standard-nomenclature" class="scroll-to">Referencias sobre nomenclatura normalizada utilizadas</a></li>
-          <li><a href="#contributors" class="scroll-to">Colaboradores de la Lista de referencia CITES</a></li>
+          <li><a href="#contributors" class="scroll-to">Colaboradores de la Lista de especies CITES</a></li>
           <li><a href="#contact" class="scroll-to">Contacto</a></li>
         </ul>
       </div>
diff --git a/app/static/about_page_fr.html b/app/static/about_page_fr.html
index 29c8569..0b7171a 100644
--- a/app/static/about_page_fr.html
+++ b/app/static/about_page_fr.html
@@ -2,9 +2,9 @@
   <div class="content">
     <div class="c1">
       <div class="content-left">
-        <h2><a id="cites-checklist">La liste de contrôle CITES</a></h2>
+        <h2><a id="cites-checklist">La Liste des espèces CITES</a></h2>
         <p>
-        La <span class="bold">Liste de contrôle des espèces CITES</span> est la liste officielle des espèces CITES (sous leurs noms scientifiques), de leurs synonymes scientifiques, de leurs noms communs en anglais, français et espagnol (dans la mesure où ils sont disponibles) avec l'indication de l'annexe à laquelle elles sont inscrites [voir la <a href="http://www.cites.org/fra/res/12/12-11R16.php">Résolution 12.11 (Rev Cop16)</a>].
+        La <span class="bold">Liste des espèces CITES</span> est la liste officielle des espèces CITES (sous leurs noms scientifiques), de leurs synonymes scientifiques, de leurs noms communs en anglais, français et espagnol (dans la mesure où ils sont disponibles) avec l'indication de l'annexe à laquelle elles sont inscrites [voir la <a href="http://www.cites.org/fra/res/12/12-11R16.php">Résolution 12.11 (Rev Cop16)</a>].
         Des informations sur l’historique des inscriptions aux annexes, sur les réserves, et le niveau taxonomique d'inscription aux annexes (par exemple, l'ensemble d'une famille ou d'un groupe) sont également disponibles sur le présent site web.
         </p>
 
@@ -36,7 +36,7 @@ <h3 class="bold">Compatibilité du navigateur</h3>
 
         <h2><a id="advanced-options">Options avancées:</a></h2>
         <p>
-        Sous l’onglet &#8220;Options avancées&#8221;, les utilisateurs ont la possibilité de personnaliser l’affichage web et les résultats de la Liste de contrôle comme suit:
+        Sous l’onglet &#8220;Options avancées&#8221;, les utilisateurs ont la possibilité de personnaliser l’affichage web et les résultats de la Liste des espèces comme suit:
         </p>
         <ul>
           <li>
@@ -67,13 +67,13 @@ <h2><a id="timelines">Frise chronologique:</a></h2>
 
         <h2><a id="standard-nomenclature">Les références de nomenclature normalisées</a></h2>
         <p>Les noms taxonomiques qui ont été officiellement adoptés par la Conférence des Parties [voir la liste des références de nomenclature normalisées dans la
-          <a href="http://www.cites.org/fra/res/12/12-11R16.php">Résolution Conf. 12.11 (Rev.CoP16)</a>] apparaissent en caractères gras dans la <span class="italic">Liste de contrôle</span>,
-          par exemple <span class="bold italic">Acinonyx jubatus</span> (le guépard). C’est le cas pour la plupart des taxons. Il arrive cependant qu'aucune référence de nomenclature normalisée n'ait été adoptée pour les espèces constituant un taxon supérieur. Dans ce cas, une référence définie par le UNEP-WCMC aura été utilisée. Le nom de ces taxons n'est pas inscrit en gras, par exemple <span class="italic">Tridacna maxima</span> (ou n’importe quelle espèce de Tridacnidae), comme dans les versions imprimées antérieures de la <span class="italic">Liste de contrôle</span>.
+          <a href="http://www.cites.org/fra/res/12/12-11R16.php">Résolution Conf. 12.11 (Rev.CoP16)</a>] apparaissent en caractères gras dans la <span class="italic">Liste des espèces</span>,
+          par exemple <span class="bold italic">Acinonyx jubatus</span> (le guépard). C’est le cas pour la plupart des taxons. Il arrive cependant qu'aucune référence de nomenclature normalisée n'ait été adoptée pour les espèces constituant un taxon supérieur. Dans ce cas, une référence définie par le UNEP-WCMC aura été utilisée. Le nom de ces taxons n'est pas inscrit en gras, par exemple <span class="italic">Tridacna maxima</span> (ou n’importe quelle espèce de Tridacnidae), comme dans les versions imprimées antérieures de la <span class="italic">Liste des espèces</span>.
         </p>
 
-        <h2><a id="contributors">Les bailleurs de fonds de la Liste de contrôle CITES</a></h2>
+        <h2><a id="contributors">Les bailleurs de fonds de la Liste des espèces CITES</a></h2>
         <p>
-        La Liste de contrôle CITES a été mise au point par le UNEP-WCMC, pour le compte du Secrétariat CITES. La gestion de cette base de données est soutenue financièrement par de multiples partenaires, que ce soit dans le cadre d’un projet ou à plus long terme. Au nombre des bailleurs de fonds actuels figurent: le WCMC (UK), l’Union Européenne et le Secrétariat CITES.</p>
+        La Liste des espèces CITES a été mise au point par le UNEP-WCMC, pour le compte du Secrétariat CITES. La gestion de cette base de données est soutenue financièrement par de multiples partenaires, que ce soit dans le cadre d’un projet ou à plus long terme. Au nombre des bailleurs de fonds actuels figurent: le WCMC (UK), l’Union Européenne et le Secrétariat CITES.</p>
         <p>
         Cette source d’information est le fruit d’une longue collaboration entre d’innombrables scientifiques du monde entier et de nombreuses organisations, dont la contribution est vivement appréciée.
         </p>
@@ -104,12 +104,12 @@ <h2><a id="contact">Contact</a></h2>
       </div>
       <div class="menu-right">
         <ul>
-          <li><a href="#cites-checklist" class="scroll-to">La liste de contrôle CITES</a></li>
+          <li><a href="#cites-checklist" class="scroll-to">La Liste des espèces CITES</a></li>
           <li><a href="#web-display" class="scroll-to">L’affichage web et le téléchargement de données</a></li>
           <li><a href="#advanced-options" class="scroll-to">Options avancées</a></li>
           <li><a href="#timelines" class="scroll-to">Frise chronologique</a></li>
           <li><a href="#standard-nomenclature" class="scroll-to">Les références de nomenclature normalisées</a></li>
-          <li><a href="#contributors" class="scroll-to">Les bailleurs de fonds de la Liste de contrôle CITES</a></li>
+          <li><a href="#contributors" class="scroll-to">Les bailleurs de fonds de la Liste des espèces CITES</a></li>
           <li><a href="#contact" class="scroll-to">Contact</a></li>
         </ul>
       </div>
diff --git a/app/static/terms_of_use_page_es.html b/app/static/terms_of_use_page_es.html
index 25df77f..eb7152b 100644
--- a/app/static/terms_of_use_page_es.html
+++ b/app/static/terms_of_use_page_es.html
@@ -1,10 +1,10 @@
 <div class="wrap">
   <div class="content">
     <div class="c1">
-        <h2>Términos y condiciones de uso de los datos de la Lista de referencia CITES</h2>
+        <h2>Términos y condiciones de uso de los datos de la Lista de especies CITES</h2>
 
         <h2>1. INTRODUCCIÓN</h2>
-        <p>Al Usuario se le proporciona acceso a la información, los datos y los datos de atributos a través del sitio web de la Lista de referencia CITES (los "Materiales") en el entendimiento de que el Usuario lee y acepta los Términos y Condiciones que se exponen más adelante. Para los fines de este Acuerdo, los Materiales comprenden todas las listas de especies, listas de referencia y otra información disponible para descargarla y contenida en cualquier parte del sitio web de la Lista de referencia CITES.</p>
+        <p>Al Usuario se le proporciona acceso a la información, los datos y los datos de atributos a través del sitio web de la Lista de especies CITES (los "Materiales") en el entendimiento de que el Usuario lee y acepta los Términos y Condiciones que se exponen más adelante. Para los fines de este Acuerdo, los Materiales comprenden todas las listas de especies, listas de referencia y otra información disponible para descargarla y contenida en cualquier parte del sitio web de la Lista de especies CITES.</p>
 
         <p class="strong">SÍRVASE LEER ESTOS TÉRMINOS Y CONDICIONES DETENIDAMENTE. SI NO ESTÁ DE ACUERDO CON CUALQUIERA DE ESTOS TÉRMINOS Y CONDICIONES, NO DESCARGUE. AL DESCARGAR LOS MATERIALES DISPONIBLES EN LA PÁGINA WEB DE LA LISTA DE REFERENCIA CITES, EL USUARIO ACEPTA LOS TÉRMINOS Y CONDICIONES EXPUESTOS A CONTINUACIÓN, Y SE COMPROMETE A CUMPLIRLOS.</p>
 
@@ -20,8 +20,8 @@ <h2>4. PROHIBICIÓN DE USO CON FINES COMERCIALES</h2>
         <p>Ni a) los Materiales ni b) cualquier trabajo derivado de los Materiales o basado en ellos ("Trabajos Derivados") pueden ser usados con Fines Comerciales sin la autorización previa por escrito de la Secretaría de la CITES y el PNUMA. Para los fines de estos Términos y Condiciones, "Fines comerciales" significa cualquier uso para generar ganancias. Para solicitar autorización de uso con Fines Comerciales de los Materiales, sírvase enviar un correo electrónico a <a href="mailto:info@cites.org" target="_top">info@cites.org</a> indicando sus necesidades.</p>
 
         <h2>5. ATRIBUCIÓN</h2>
-        <p>Debe asegurarse de que la mención que figura infra se reproduce siempre claramente en toda publicación o todo análisis que contenga los datos de la Lista de referencia CITES, en cualquier forma o formato derivado:</p>
-        <p>UNEP-WCMC (Comps.) 2013. Página Web de la Lista de referencia CITES. Secretaría de la CITES, Ginebra, Suiza. Compilado por UNEP-WCMC, Cambridge, Reino Unido. Disponoble en: <a href="http://checklist.cites.org">http://checklist.cites.org</a>. [Acceso (sírvase insertar la fecha de descarga dd/mm/aaaa)].</p>
+        <p>Debe asegurarse de que la mención que figura infra se reproduce siempre claramente en toda publicación o todo análisis que contenga los datos de la Lista de especies CITES, en cualquier forma o formato derivado:</p>
+        <p>UNEP-WCMC (Comps.) 2013. Página Web de la Lista de especies CITES. Secretaría de la CITES, Ginebra, Suiza. Compilado por UNEP-WCMC, Cambridge, Reino Unido. Disponoble en: <a href="http://checklist.cites.org">http://checklist.cites.org</a>. [Acceso (sírvase insertar la fecha de descarga dd/mm/aaaa)].</p>
 
         <h2>6. NO CONCESIÓN DE DERECHOS DE PROPIEDAD INTELECTUAL</h2>
         <p>Al Usuario no se le concede ningún derecho en los Materiales en virtud de estos Términos y Condiciones ni como resultado de cualquier uso de los Materiales.</p>
@@ -39,10 +39,10 @@ <h2>10. MODIFICACIÓN DE ESTOS TÉRMINOS Y CONDICIONES</h2>
         <p>La Secretaría de la CITES y el PNUMA se reservan el derecho de modificar estos Términos y Condiciones de vez en cuando sin previo aviso. Por tanto, asegúrese de que lee estos Términos y Condiciones cada vez que descarga Materiales. Descargar los Materiales significa que se acepta sin reservas la versión más reciente de estos Términos y Condiciones.</p>
 
         <h2>11. RESOLUCIÓN DE CONTROVERSIAS</h2>
-        <p>Toda controversia que surja en relación con el uso de los Materiales se resolverá mediante negociación amistosa con los proveedores de la Lista de referencia CITES. Si fracasaran los intentos de negociación amistosa, la controversia, a petición del Usuario o de los proveedores de la Lista de referencia CITES, se someterá a arbitraje de acuerdo con las reglas de arbitraje de la CNUDMI vigentes. </p>
+        <p>Toda controversia que surja en relación con el uso de los Materiales se resolverá mediante negociación amistosa con los proveedores de la Lista de especies CITES. Si fracasaran los intentos de negociación amistosa, la controversia, a petición del Usuario o de los proveedores de la Lista de especies CITES, se someterá a arbitraje de acuerdo con las reglas de arbitraje de la CNUDMI vigentes. </p>
 
         <h2>12. COMUNICACIÓN</h2>
-        <p>Toda comunicación en relación con estos Términos y Condiciones y cualquier problema que surja con ellos se hará por escrito, en inglés, y se enviará por correo electrónico. La dirección para comunicarse con el proveedor de la Lista de referencia CITES es <a href="mailto:info@cites.org" target="_top">info@cites.org</a>.</p>
+        <p>Toda comunicación en relación con estos Términos y Condiciones y cualquier problema que surja con ellos se hará por escrito, en inglés, y se enviará por correo electrónico. La dirección para comunicarse con el proveedor de la Lista de especies CITES es <a href="mailto:info@cites.org" target="_top">info@cites.org</a>.</p>
       </div>
     </div>
   </div>
diff --git a/app/static/terms_of_use_page_fr.html b/app/static/terms_of_use_page_fr.html
index 70d6b6d..8aaad81 100644
--- a/app/static/terms_of_use_page_fr.html
+++ b/app/static/terms_of_use_page_fr.html
@@ -1,10 +1,10 @@
 <div class="wrap">
   <div class="content">
     <div class="c1">
-        <h2>Conditions d’utilisation des données de la Liste de contrôle CITES</h2>
+        <h2>Conditions d’utilisation des données de la Liste des espèces CITES</h2>
 
         <h2>1. INTRODUCTION</h2>
-        <p>L’accès à l’information, aux données ainsi qu’aux données d’attributs assuré par l'intermédiaire du site ‘Liste de contrôle CITES’ ("Ressources") est fourni à l’Utilisateur à la condition que celui-ci lise et accepte les Conditions établies ci-dessous. Aux fins du présent Accord, les Ressources se composent de toutes les listes d’espèces, listes de contrôle et autres informations disponibles en téléchargement sur l'ensemble du site web Liste de contrôle CITES. </p>
+        <p>L’accès à l’information, aux données ainsi qu’aux données d’attributs assuré par l'intermédiaire du site ‘Liste des espèces CITES’ ("Ressources") est fourni à l’Utilisateur à la condition que celui-ci lise et accepte les Conditions établies ci-dessous. Aux fins du présent Accord, les Ressources se composent de toutes les listes d’espèces, listes de contrôle et autres informations disponibles en téléchargement sur l'ensemble du site web Liste des espèces CITES. </p>
 
         <p class="strong">VEUILLEZ LIRE ATTENTIVEMENT CES CONDITIONS D'UTILISATION. SI VOUS NE CONSENTEZ PAS AUX PRÉSENTES CONDITIONS GÉNÉRALES, VEUILLEZ NE PAS TÉLÉCHARGER. EN TÉLÉCHARGEANT LES RESSOURCES DISPONIBLES SUR LE SITE WEB LISTE DE CONTRÔLE CITES, L’UTILISATEUR ACCEPTE DE SE CONFORMER AUX CONDITIONS D'UTILISATION CI-DESSOUS.</p>
 
@@ -19,9 +19,9 @@ <h2>4. PAS D’UTILISATION COMMERCIALE</h2>
         <p>Ni (a) les Ressources, ni (b) aucun travail dérivé des Ressources (« Travaux dérivés ») ou fondé sur elles ne peuvent être utilisés à des fins commerciales sans autorisation écrite préalable du Secrétariat CITES ou du PNUE. Dans les présentes Conditions d'utilisation, « Utilisation Commerciale » signifie toute utilisation visant à générer des revenus. Pour demander l'autorisation d’utiliser les Ressources à des fins commerciales, veuillez envoyer un courriel à l’adresse <a href="mailto:info@cites.org" target="_top">info@cites.org</a> en précisant votre demande.</p>
 
         <h2>5. MENTION LÉGALE</h2>
-        <p>Vous devez vous assurer que la mention ci-dessous soit toujours clairement mentionnée dans toute publication ou analyse utilisant les données de la Liste de contrôle CITES, sous quelque forme ou format que ce soit:
+        <p>Vous devez vous assurer que la mention ci-dessous soit toujours clairement mentionnée dans toute publication ou analyse utilisant les données de la Liste des espèces CITES, sous quelque forme ou format que ce soit:
         </p>
-        <p>UNEP-WCMC (Comps.) 2013. Site internet de la Liste de contrôle des espèces CITES. Secrétariat CITES, Genève, Suisse. Compilé par le UNEP-WCMC, Cambridge, R.-U. Disponible à l’adresse suivante: <a href="http://checklist.cites.org">http://checklist.cites.org</a>. [Consulté le (veuillez saisir la date du téléchargement jj/mm/aaaa)].</p>
+        <p>UNEP-WCMC (Comps.) 2013. Site internet de la Liste des espèces CITES. Secrétariat CITES, Genève, Suisse. Compilé par le UNEP-WCMC, Cambridge, R.-U. Disponible à l’adresse suivante: <a href="http://checklist.cites.org">http://checklist.cites.org</a>. [Consulté le (veuillez saisir la date du téléchargement jj/mm/aaaa)].</p>
 
         <h2>6. NON-OCTROI DES DROITS DE PROPRIÉTÉ INTELLECTUELLE</h2>
         <p>Les présentes Conditions d'utilisation ne confèrent à l'Utilisateur aucun droit sur les Ressources elles-mêmes ou résultant de l’utilisation desdites Ressources.</p>
@@ -40,10 +40,10 @@ <h2>10. CHANGEMENTS DANS LES CONDITIONS</h2>
         <p>Le Secrétariat CITES et le PNUE se réservent le droit de modifier ces Conditions à tout moment et sans avis. En conséquence, veuillez lire les Conditions à chaque fois que vous télécharger des Ressources. En téléchargeant des Ressources, acceptez d'être lié vous signifiez que vous acceptez l'intégralité de ces Conditions dans leur version la plus récente.</p>
 
         <h2>11. RÉSOLUTION DES LITIGES</h2>
-        <p>Tout conflit découlant directement ou indirectement de toute utilisation des Ressources sera être résolu par une négociation a l’amiable avec les fournisseurs de la Liste de contrôle des espèces CITES. Si la négociation à l’amiable échoue, ce différend devra, à la demande soit de l’Utilisateur, soit des fournisseurs de la Liste de contrôle des espèces CITES, faire l'objet d'une procédure d'arbitrage conformément au Règlement d'arbitrage en vigueur de la CNUDCI.</p>
+        <p>Tout conflit découlant directement ou indirectement de toute utilisation des Ressources sera être résolu par une négociation a l’amiable avec les fournisseurs de la Liste des espèces CITES. Si la négociation à l’amiable échoue, ce différend devra, à la demande soit de l’Utilisateur, soit des fournisseurs de la Liste des espèces CITES, faire l'objet d'une procédure d'arbitrage conformément au Règlement d'arbitrage en vigueur de la CNUDCI.</p>
 
         <h2>12. COMMUNICATION</h2>
-        <p>Toute communication concernant les présentes Conditions et tout différend pouvant en découler sera faite par écrit en anglais, et envoyées par courriel. Pour toute communication avec les fournisseurs de la Liste de contrôle des espèces CITES, veuillez vous adresser à <a href="mailto:info@cites.org" target="_top">info@cites.org</a>
+        <p>Toute communication concernant les présentes Conditions et tout différend pouvant en découler sera faite par écrit en anglais, et envoyées par courriel. Pour toute communication avec les fournisseurs de la Liste des espèces CITES, veuillez vous adresser à <a href="mailto:info@cites.org" target="_top">info@cites.org</a>
         .</p>
       </div>
     </div>

From a6ae88e0ac41f9da35acd9d37918faa25ccb3eab Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Mon, 28 Jul 2014 15:17:47 +0100
Subject: [PATCH 50/58] [#75587748] fixed remaining French & Spanish Checklist
 titles

---
 app/javascripts/locales/fr.js        | 2 +-
 app/static/terms_of_use_page_es.html | 2 +-
 app/static/terms_of_use_page_fr.html | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/javascripts/locales/fr.js b/app/javascripts/locales/fr.js
index ea55d3a..d4e8c12 100644
--- a/app/javascripts/locales/fr.js
+++ b/app/javascripts/locales/fr.js
@@ -99,6 +99,6 @@ Em.I18n.locales.fr = {
   'reports.latest.title': 'Votre rapport est en cours de production',
 
   'splash.p1': 'La CITES (Convention sur le commerce international des espèces de faune et de flore sauvages menacées d\'extinction) est un accord international entre Etats qui vise à s\'assurer que le commerce international de spécimens d\'animaux ou de plantes sauvages ne menace pas la survie de ces derniers',
-  'splash.p2': 'La liste de contrôle CITES permet d\'explorer plus de 35 000 espèces animales ou végétales et de vérifier leur degré de protection',
+  'splash.p2': 'La Liste des espèces CITES permet d\'explorer plus de 35 000 espèces animales ou végétales et de vérifier leur degré de protection',
   'splash.button': 'Commencer l\'exploration'
 };
diff --git a/app/static/terms_of_use_page_es.html b/app/static/terms_of_use_page_es.html
index eb7152b..b7b3c59 100644
--- a/app/static/terms_of_use_page_es.html
+++ b/app/static/terms_of_use_page_es.html
@@ -6,7 +6,7 @@ <h2>Términos y condiciones de uso de los datos de la Lista de especies CITES</h
         <h2>1. INTRODUCCIÓN</h2>
         <p>Al Usuario se le proporciona acceso a la información, los datos y los datos de atributos a través del sitio web de la Lista de especies CITES (los "Materiales") en el entendimiento de que el Usuario lee y acepta los Términos y Condiciones que se exponen más adelante. Para los fines de este Acuerdo, los Materiales comprenden todas las listas de especies, listas de referencia y otra información disponible para descargarla y contenida en cualquier parte del sitio web de la Lista de especies CITES.</p>
 
-        <p class="strong">SÍRVASE LEER ESTOS TÉRMINOS Y CONDICIONES DETENIDAMENTE. SI NO ESTÁ DE ACUERDO CON CUALQUIERA DE ESTOS TÉRMINOS Y CONDICIONES, NO DESCARGUE. AL DESCARGAR LOS MATERIALES DISPONIBLES EN LA PÁGINA WEB DE LA LISTA DE REFERENCIA CITES, EL USUARIO ACEPTA LOS TÉRMINOS Y CONDICIONES EXPUESTOS A CONTINUACIÓN, Y SE COMPROMETE A CUMPLIRLOS.</p>
+        <p class="strong">SÍRVASE LEER ESTOS TÉRMINOS Y CONDICIONES DETENIDAMENTE. SI NO ESTÁ DE ACUERDO CON CUALQUIERA DE ESTOS TÉRMINOS Y CONDICIONES, NO DESCARGUE. AL DESCARGAR LOS MATERIALES DISPONIBLES EN LA PÁGINA WEB DE LA LISTA DE ESPECIES CITES, EL USUARIO ACEPTA LOS TÉRMINOS Y CONDICIONES EXPUESTOS A CONTINUACIÓN, Y SE COMPROMETE A CUMPLIRLOS.</p>
 
         <h2>2. PUBLICACIÓN</h2>
         <p>El Usuario puede publicar los Materiales total o parcialmente, inclusive en línea, siempre y cuando a) los Materiales no sean descargables, y b) la atribución correcta sea claramente visible (véase la cláusula 5 infra). Debe asegurarse de que usa la versión más reciente disponible de los Materiales y de que la fecha de descarga es visible en la versión publicada. Los materiales publicados en línea deben incluir un claro enlace con la fuente en línea original (checklist.cites.org). Recomendamos encarecidamente que los materiales pertinentes sean revisados por la Secretaría de la CITES antes de ser publicados. Las solicitudes de autorización, con una descripción del propósito y el alcance de la reproducción, deben ser enviadas a la Secretaría de la CITES, International Environment House, 15, Chemin des Anémones, CH 1219 Châtelaine (Ginebra, Suiza) o por correo electrónico a <a href="mailto:info@cites.org" target="_top">info@cites.org</a>
diff --git a/app/static/terms_of_use_page_fr.html b/app/static/terms_of_use_page_fr.html
index 8aaad81..c9c7b70 100644
--- a/app/static/terms_of_use_page_fr.html
+++ b/app/static/terms_of_use_page_fr.html
@@ -6,7 +6,7 @@ <h2>Conditions d’utilisation des données de la Liste des espèces CITES</h2>
         <h2>1. INTRODUCTION</h2>
         <p>L’accès à l’information, aux données ainsi qu’aux données d’attributs assuré par l'intermédiaire du site ‘Liste des espèces CITES’ ("Ressources") est fourni à l’Utilisateur à la condition que celui-ci lise et accepte les Conditions établies ci-dessous. Aux fins du présent Accord, les Ressources se composent de toutes les listes d’espèces, listes de contrôle et autres informations disponibles en téléchargement sur l'ensemble du site web Liste des espèces CITES. </p>
 
-        <p class="strong">VEUILLEZ LIRE ATTENTIVEMENT CES CONDITIONS D'UTILISATION. SI VOUS NE CONSENTEZ PAS AUX PRÉSENTES CONDITIONS GÉNÉRALES, VEUILLEZ NE PAS TÉLÉCHARGER. EN TÉLÉCHARGEANT LES RESSOURCES DISPONIBLES SUR LE SITE WEB LISTE DE CONTRÔLE CITES, L’UTILISATEUR ACCEPTE DE SE CONFORMER AUX CONDITIONS D'UTILISATION CI-DESSOUS.</p>
+        <p class="strong">VEUILLEZ LIRE ATTENTIVEMENT CES CONDITIONS D'UTILISATION. SI VOUS NE CONSENTEZ PAS AUX PRÉSENTES CONDITIONS GÉNÉRALES, VEUILLEZ NE PAS TÉLÉCHARGER. EN TÉLÉCHARGEANT LES RESSOURCES DISPONIBLES SUR LE SITE WEB LISTE DE ESPÉCES CITES, L’UTILISATEUR ACCEPTE DE SE CONFORMER AUX CONDITIONS D'UTILISATION CI-DESSOUS.</p>
 
         <h2>2. EDITION</h2>
         <p>Vous pouvez publier les Ressources en tout ou en partie, y compris en ligne, à condition que (a) les Ressources ne soient pas téléchargeables et (b) la source soit dûment et clairement mentionnée (voir la clause 5 ci-dessous). Assurez-vous que vous utilisez la version la plus récente des Ressources et que la date du téléchargement est visible dans la version publiée. Les Ressources publiées en ligne doivent indiquer un lien visible vers la source initiale en ligne (listedecontrôledesespéces.cites.org). Avant toute publication, nous vous recommandons vivement de soumettre les ressources utilisées au Secrétariat CITES pour examen. Les demandes d’autorisation, précisant l’objet et le but de la reproduction, devront être adressées au Secrétariat CITES, Maison internationale de l’environnement, 15 Chemin des Anémones, CH-1219 Châtelaine (Genève), Suisse ou par e-mail à <a href="mailto:info@cites.org" target="_top">info@cites.org</a>

From 03503f07a6d88adaa4e6d0dd8f11b7bf1d4292a1 Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Tue, 29 Jul 2014 11:26:56 +0100
Subject: [PATCH 51/58] fixed some issues reported by jslint

---
 app/javascripts/adapters/sapi_adapter.js      |  2 +-
 .../controllers/download_controller.js        |  8 ++---
 app/javascripts/locales/en.js                 | 18 ++++++++---
 app/javascripts/locales/es.js                 | 19 ++++++++---
 app/javascripts/locales/fr.js                 | 19 ++++++++---
 app/javascripts/models/locations_loader.js    |  2 +-
 app/javascripts/routers/router.js             | 32 ++++++++++++++-----
 app/javascripts/static_page.js                |  2 +-
 app/javascripts/views/checklist_form.js       | 10 +++---
 app/javascripts/views/download_view.js        |  2 +-
 app/javascripts/views/kingdom_list_view.js    |  4 +--
 app/javascripts/views/saved_search_view.js    |  4 ++-
 .../views/taxon_concept_list_view.js          | 10 +++---
 13 files changed, 88 insertions(+), 44 deletions(-)

diff --git a/app/javascripts/adapters/sapi_adapter.js b/app/javascripts/adapters/sapi_adapter.js
index 6cf5646..f103318 100644
--- a/app/javascripts/adapters/sapi_adapter.js
+++ b/app/javascripts/adapters/sapi_adapter.js
@@ -56,7 +56,7 @@ Checklist.DownloadAdapter = {
       var store = Checklist.LocalStorageAdapter;
       var ids   = store.getAll(Checklist.Download).map(
         function(item, index) {
-          return item["id"];
+          return item.id;
         });
 
       var content = Checklist.store.findQuery(Checklist.Download, {ids: ids});
diff --git a/app/javascripts/controllers/download_controller.js b/app/javascripts/controllers/download_controller.js
index 300f503..28da57d 100644
--- a/app/javascripts/controllers/download_controller.js
+++ b/app/javascripts/controllers/download_controller.js
@@ -31,7 +31,7 @@ Checklist.DownloadController = Ember.ArrayController.extend({
   content: Checklist.store.findQuery(Checklist.Download, {ids: (function() {
     var store = Checklist.LocalStorageAdapter;
     return store.getAll(Checklist.Download).map(function(item, index) {
-      return item["id"];
+      return item.id;
     });
   })()}),
 
@@ -52,7 +52,7 @@ Checklist.DownloadController = Ember.ArrayController.extend({
     var store = Checklist.LocalStorageAdapter;
     var ids   = store.getAll(Checklist.Download).map(
       function(item, index) {
-        return item["id"];
+        return item.id;
       });
 
     // Query the server to return the current state of the objects for
@@ -102,7 +102,7 @@ Checklist.DownloadController = Ember.ArrayController.extend({
 
   _interval: null,
   startPolling: function() {
-    if (this.get('_interval') == null) {
+    if (this.get('_interval') === null) {
       var that = this;
       var id = setInterval(function() {
         that.refresh();
@@ -112,7 +112,7 @@ Checklist.DownloadController = Ember.ArrayController.extend({
     }
   },
   stopPolling: function() {
-    if (this.get('_interval') != null) {
+    if (this.get('_interval') !== null) {
       clearInterval(this.get('_interval'));
     }
   }
diff --git a/app/javascripts/locales/en.js b/app/javascripts/locales/en.js
index 5d05dd2..2bf83e8 100644
--- a/app/javascripts/locales/en.js
+++ b/app/javascripts/locales/en.js
@@ -26,7 +26,8 @@ Em.I18n.locales.en = {
   'distribution.see_all': 'See all...',
 
   'timeline.party': 'See reservations to CITES listings',
-  'timeline.split': 'NB: this taxon is split-listed. See also timeline(s) for lower taxa.',
+  'timeline.split': 'NB: this taxon is split-listed. See also timeline(s) ' +
+    'for lower taxa.',
   'timeline.nohistory': 'No history information is available for this taxon.',
   'timeline.reservations': 'Appendix-{{appendix}} reservations:',
   'timeline.event.appendix': 'CITES Appendix {{appendix}}',
@@ -91,14 +92,21 @@ Em.I18n.locales.en = {
   'reports.failed.count.one': '1 report failed',
   'reports.failed.count.other': '{{count}} reports failed',
 
-  'reports.failed.description': 'You can restart a download, or remove it from the list.',
-  'reports.generating.description': 'It can take some time, but you can close this window and continue working in other CITES Checklist reports.',
+  'reports.failed.description': 'You can restart a download, or remove it ' +
+    'from the list.',
+  'reports.generating.description': 'It can take some time, but you can ' +
+    'close this window and continue working in other CITES Checklist reports.',
 
   'reports.ready.title': 'Your Reports',
   'reports.generating.title': 'Currently Generating Reportings',
   'reports.latest.title': 'Your report is being generated',
 
-  'splash.p1': 'CITES (the Convention on International Trade in Endangered Species of Wild Fauna and Flora) is an international agreement between governments that aims to ensure that international trade in specimens of wild animals and plants does not threaten their survival.',
-  'splash.p2': 'The Checklist of CITES Species allows the exploration of more than 35,000 species of animals and plants and their degree of protection.',
+  'splash.p1': 'CITES (the Convention on International Trade in Endangered ' +
+    'Species of Wild Fauna and Flora) is an international agreement between ' +
+    'governments that aims to ensure that international trade in specimens ' +
+    'of wild animals and plants does not threaten their survival.',
+  'splash.p2': 'The Checklist of CITES Species allows the exploration of ' +
+    'more than 35,000 species of animals and plants and their degree of ' +
+    'protection.',
   'splash.button': 'Start Exploring'
 };
diff --git a/app/javascripts/locales/es.js b/app/javascripts/locales/es.js
index d4ffe2e..72a581e 100644
--- a/app/javascripts/locales/es.js
+++ b/app/javascripts/locales/es.js
@@ -26,7 +26,8 @@ Em.I18n.locales.es = {
   'distribution.see_all': 'Ver todos...',
 
   'timeline.party': 'Ver reservas a inclusiones en los Apéndices de la CITES',
-  'timeline.split': 'NB: inclusión dividida para este taxón. Vea también la(s) línea(s) de tiempo para los taxones inferiores.',
+  'timeline.split': 'NB: inclusión dividida para este taxón. Vea también ' +
+    'la(s) línea(s) de tiempo para los taxones inferiores.',
   'timeline.nohistory': 'No hay información de historial para este taxón.',
   'timeline.reservations': 'Reservas al Apéndice {{appendix}}:',
   'timeline.event.appendix': 'Apéndice {{appendix}} de la CITES',
@@ -91,14 +92,22 @@ Em.I18n.locales.es = {
   'reports.failed.count.one': 'Se produjo un error en 1 informe',
   'reports.failed.count.other': 'Se produjo un error en {{count}} informes',
 
-  'reports.failed.description': 'Puede reiniciar una descarga, o bien quitarla de la lista.',
-  'reports.generating.description': 'Puede demorar cierto tiempo, pero usted puede cerrar esta ventana y continuar trabajando con otros informes de la Lista de especies CITES.',
+  'reports.failed.description': 'Puede reiniciar una descarga, o bien ' +
+    'quitarla de la lista.',
+  'reports.generating.description': 'Puede demorar cierto tiempo, pero ' +
+    'usted puede cerrar esta ventana y continuar trabajando con otros ' +
+    'informes de la Lista de especies CITES.',
 
   'reports.ready.title': 'Sus informes',
   'reports.generating.title': 'Generando informes actualmente',
   'reports.latest.title': 'Se ha generado su informe',
 
-  'splash.p1': 'La CITES (la Convención sobre el Comercio Internacional de Especies Amenazadas de Fauna y Flora Silvestres) es un acuerdo internacional concertado entre los gobiernos. Tiene por finalidad velar por que el comercio internacional de especímenes de animales y plantas silvestres no constituya una amenaza para su supervivencia.',
-  'splash.p2': 'La Lista de especies CITES le permite explorar más de 35.000 especies de animales y plantas y su grado de protección.',
+  'splash.p1': 'La CITES (la Convención sobre el Comercio Internacional de ' +
+    'Especies Amenazadas de Fauna y Flora Silvestres) es un acuerdo ' +
+    'internacional concertado entre los gobiernos. Tiene por finalidad ' +
+    'velar por que el comercio internacional de especímenes de animales y ' +
+    'plantas silvestres no constituya una amenaza para su supervivencia.',
+  'splash.p2': 'La Lista de especies CITES le permite explorar más de ' +
+    '35.000 especies de animales y plantas y su grado de protección.',
   'splash.button': 'Comenzar a explorar'
 };
diff --git a/app/javascripts/locales/fr.js b/app/javascripts/locales/fr.js
index d4e8c12..c3dbfdb 100644
--- a/app/javascripts/locales/fr.js
+++ b/app/javascripts/locales/fr.js
@@ -26,7 +26,8 @@ Em.I18n.locales.fr = {
   'distribution.see_all': 'Voir tous les...',
 
   'timeline.party': 'Voir les réserves à l\'encontre des inscriptions CITES',
-  'timeline.split': 'NB: ce taxon fait l\'objet d\'une inscription scindée; voir également le(s) calendrier(s) pour les taxons inférieurs',
+  'timeline.split': 'NB: ce taxon fait l\'objet d\'une inscription scindée; ' +
+    'voir également le(s) calendrier(s) pour les taxons inférieurs',
   'timeline.nohistory': 'Aucun historique n\'est disponible pour ce taxon',
   'timeline.reservations': 'Annexe-{{appendix}}, réserves',
   'timeline.event.appendix': 'Annexe CITES-{{appendix}} ',
@@ -91,14 +92,22 @@ Em.I18n.locales.fr = {
   'reports.failed.count.one': 'Echec du rapport',
   'reports.failed.count.other': 'Echec de {{count}} rapports',
 
-  'reports.failed.description': 'Vous pouvez relancer un téléchargement, ou le supprimer de la liste',
-  'reports.generating.description': 'Cela peut prendre du temps, mais vous pouvez fermer cette fenêtre et continuer de travailler à d\'autres rapports sur les Listes des espèces CITES',
+  'reports.failed.description': 'Vous pouvez relancer un téléchargement, ou ' +
+    'le supprimer de la liste',
+  'reports.generating.description': 'Cela peut prendre du temps, mais vous ' +
+    'pouvez fermer cette fenêtre et continuer de travailler à d\'autres ' +
+    'rapports sur les Listes des espèces CITES',
 
   'reports.ready.title': 'Vos rapports',
   'reports.generating.title': 'Rapports en cours de production',
   'reports.latest.title': 'Votre rapport est en cours de production',
 
-  'splash.p1': 'La CITES (Convention sur le commerce international des espèces de faune et de flore sauvages menacées d\'extinction) est un accord international entre Etats qui vise à s\'assurer que le commerce international de spécimens d\'animaux ou de plantes sauvages ne menace pas la survie de ces derniers',
-  'splash.p2': 'La Liste des espèces CITES permet d\'explorer plus de 35 000 espèces animales ou végétales et de vérifier leur degré de protection',
+  'splash.p1': 'La CITES (Convention sur le commerce international des ' +
+    'espèces de faune et de flore sauvages menacées d\'extinction) est un ' +
+    'accord international entre Etats qui vise à s\'assurer que le commerce ' +
+    'international de spécimens d\'animaux ou de plantes sauvages ne menace ' +
+    'pas la survie de ces derniers',
+  'splash.p2': 'La Liste des espèces CITES permet d\'explorer plus de 35 000' +
+    ' espèces animales ou végétales et de vérifier leur degré de protection',
   'splash.button': 'Commencer l\'exploration'
 };
diff --git a/app/javascripts/models/locations_loader.js b/app/javascripts/models/locations_loader.js
index 2db8f52..9cf839f 100644
--- a/app/javascripts/models/locations_loader.js
+++ b/app/javascripts/models/locations_loader.js
@@ -11,4 +11,4 @@ Checklist.LocationsLoader = {
     });
     return promise;
   }
-}
\ No newline at end of file
+};
diff --git a/app/javascripts/routers/router.js b/app/javascripts/routers/router.js
index 5f11a21..185f9e0 100644
--- a/app/javascripts/routers/router.js
+++ b/app/javascripts/routers/router.js
@@ -37,8 +37,12 @@ Checklist.Router = Ember.Router.extend({
               var params = router.get('filtersController').toParams();
               router.get('taxonConceptController').refresh(params);
 
-              router.get('applicationController').connectOutlet({outletName: 'header', viewClass: Checklist.MainHeaderView});
-              router.get('applicationController').connectOutlet({outletName: 'main', viewClass: Checklist.MainView});
+              router.get('applicationController').connectOutlet({
+                outletName: 'header', viewClass: Checklist.MainHeaderView
+              });
+              router.get('applicationController').connectOutlet({
+                outletName: 'main', viewClass: Checklist.MainView
+              });
             }, function(error){
               console.log(error);
             }
@@ -63,9 +67,13 @@ Checklist.Router = Ember.Router.extend({
               router.get('taxonConceptController').refresh(params);
 
               if (event.redraw === undefined || event.redraw) {
-                router.get('applicationController').connectOutlet({outletName: 'header', viewClass: Checklist.MainHeaderView});
+                router.get('applicationController').connectOutlet({
+                  outletName: 'header', viewClass: Checklist.MainHeaderView
+                });
               }
-              router.get('applicationController').connectOutlet({outletName: 'main', viewClass: Checklist.MainView});
+              router.get('applicationController').connectOutlet({
+                outletName: 'main', viewClass: Checklist.MainView
+              });
             }, function(error){
               console.log(error);
             }
@@ -77,8 +85,12 @@ Checklist.Router = Ember.Router.extend({
         route: '/about',
         connectOutlets: function(router, event) {
           Checklist.StaticPage.getCompiledTemplate('about_page').then(function(template) {
-            router.get('applicationController').connectOutlet({outletName: 'header', viewClass: Checklist.AboutHeaderView});
-            router.get('applicationController').connectOutlet({outletName: 'main', viewClass: Checklist.AboutView});
+            router.get('applicationController').connectOutlet({
+              outletName: 'header', viewClass: Checklist.AboutHeaderView
+            });
+            router.get('applicationController').connectOutlet({
+              outletName: 'main', viewClass: Checklist.AboutView
+            });
           }, function(error) {
             console.log(error);
             router.transitionTo('index');
@@ -90,8 +102,12 @@ Checklist.Router = Ember.Router.extend({
         route: '/terms-of-use',
         connectOutlets: function(router, event) {
           Checklist.StaticPage.getCompiledTemplate('terms_of_use_page').then(function(template) {
-            router.get('applicationController').connectOutlet({outletName: 'header', viewClass: Checklist.TermsOfUseHeaderView});
-            router.get('applicationController').connectOutlet({outletName: 'main', viewClass: Checklist.TermsOfUseView});
+            router.get('applicationController').connectOutlet({
+              outletName: 'header', viewClass: Checklist.TermsOfUseHeaderView
+            });
+            router.get('applicationController').connectOutlet({
+              outletName: 'main', viewClass: Checklist.TermsOfUseView
+            });
           }, function(error) {
             console.log(error);
             router.transitionTo('index');
diff --git a/app/javascripts/static_page.js b/app/javascripts/static_page.js
index 8c6fb9b..35b2c8f 100644
--- a/app/javascripts/static_page.js
+++ b/app/javascripts/static_page.js
@@ -19,4 +19,4 @@ Checklist.StaticPage = {
     }
     return promise;
   }
-}
+};
diff --git a/app/javascripts/views/checklist_form.js b/app/javascripts/views/checklist_form.js
index 50f209d..c77d81a 100644
--- a/app/javascripts/views/checklist_form.js
+++ b/app/javascripts/views/checklist_form.js
@@ -64,7 +64,7 @@ Checklist.SearchTextField = Em.TextField.extend({
 
   focusOut: function(event) {
     if ($.browser.msie) {
-      if (this.$().val().length == 0) {
+      if (this.$().val().length === 0) {
         this.$().val(this.get('placeholder'));
       }
     }
@@ -82,9 +82,9 @@ Checklist.SearchTextField = Em.TextField.extend({
     var transform = function ($1, match) {
       return '<span style="text-decoration:underline">' + match + '</span>';
     };
-    return item.
-    replace(new RegExp('^(' + query + ')', 'i'), transform).
-    replace(new RegExp('=(' + query + ')', 'ig'), transform);
+    return item
+      .replace(new RegExp('^(' + query + ')', 'i'), transform)
+      .replace(new RegExp('=(' + query + ')', 'ig'), transform);
   },
 
   parser: function(data) {
@@ -136,7 +136,7 @@ Checklist.GeoEntityTextField = Em.TextField.extend({
 
   focusOut: function(event) {
     if ($.browser.msie) {
-      if (this.$().val().length == 0) {
+      if (this.$().val().length === 0) {
         this.$().val(this.get('placeholder'));
       }
     }
diff --git a/app/javascripts/views/download_view.js b/app/javascripts/views/download_view.js
index c023bdb..9eb8179 100644
--- a/app/javascripts/views/download_view.js
+++ b/app/javascripts/views/download_view.js
@@ -12,7 +12,7 @@ Handlebars.registerHelper("commaify", function(value, options) {
   var comma_value = "";
   for ( var i = 0; i <= value.length-1; i++ ){
     comma_value = value[i] + comma_value;
-    if ((i+1) % 3 == 0 && (value.length-1) !== i) comma_value = ',' + comma_value;
+    if ((i+1) % 3 === 0 && (value.length-1) !== i) { comma_value = ',' + comma_value; }
   }
 
   return new Handlebars.SafeString(comma_value);
diff --git a/app/javascripts/views/kingdom_list_view.js b/app/javascripts/views/kingdom_list_view.js
index 59f4478..4dca7be 100644
--- a/app/javascripts/views/kingdom_list_view.js
+++ b/app/javascripts/views/kingdom_list_view.js
@@ -133,7 +133,7 @@ Checklist.KingdomListView = Ember.View.extend({
      .resize(this.onWindowResize);
 
     // Redraw custom form elements (advanced options box)
-    if (Checklist.CFE != null) {
+    if (Checklist.CFE !== null) {
       Checklist.CFE.repaint();
     }
   },
@@ -200,7 +200,7 @@ Checklist.KingdomListView = Ember.View.extend({
       // wrapper in the grouping <div>
       if ($(item).hasClass('persist-area') || index == ($('.listing-item').length - 1)) {
         if (current_group.length > 0) {
-          var to_wrap = $(current_group).map (function () {return this.toArray();} );
+          var to_wrap = $(current_group).map(function() {return this.toArray();} );
           to_wrap.wrapAll('<div class="persist-area">');
         }
 
diff --git a/app/javascripts/views/saved_search_view.js b/app/javascripts/views/saved_search_view.js
index 2368113..a83b283 100644
--- a/app/javascripts/views/saved_search_view.js
+++ b/app/javascripts/views/saved_search_view.js
@@ -35,7 +35,9 @@ Checklist.SavedSearchTextField = Em.TextField.extend({
   },
   insertNewline: function(view) {
     var val = $(view.target).val();
-    if (!val) return;
+    if (!val) {
+      return;
+    }
 
     var saved_search = Checklist.local_store.createRecord(
       Checklist.SavedSearch,
diff --git a/app/javascripts/views/taxon_concept_list_view.js b/app/javascripts/views/taxon_concept_list_view.js
index e117fd4..dff03fa 100644
--- a/app/javascripts/views/taxon_concept_list_view.js
+++ b/app/javascripts/views/taxon_concept_list_view.js
@@ -155,17 +155,17 @@ Checklist.TaxonConceptListView = Ember.CollectionView.extend({
     },
     click: function(event) {
       // Ignore clicks on the history graph
-      if ($(event.target).parents('.slide').length > 0) return;
+      if ($(event.target).parents('.slide').length > 0) { return; }
       // Ignore clicks on circle icons
-      if ($(event.target).hasClass('circle')) return;
-      if ($(event.target).is('a.btn-saved')) return;
+      if ($(event.target).hasClass('circle')) { return; }
+      if ($(event.target).is('a.btn-saved')) { return; }
 
-      if (!this.get('context.isLoaded')) return;
+      if (!this.get('context.isLoaded')) { return; }
 
       var $timeline = this.$().find('.area-holder');
       var that = this;
 
-      if ($timeline.find('.area-b').length == 0) {
+      if ($timeline.find('.area-b').length === 0) {
         var view = Checklist.TaxonConceptHistoryView.create({
           content: that.get('context.timelines_for_taxon_concept')
         });

From ed94b5e636cba3f30f194c76bd455fab4fdc3932 Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Tue, 29 Jul 2014 12:09:25 +0100
Subject: [PATCH 52/58] check for presence of window.console

---
 app/javascripts/routers/router.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/javascripts/routers/router.js b/app/javascripts/routers/router.js
index 185f9e0..9f22e38 100644
--- a/app/javascripts/routers/router.js
+++ b/app/javascripts/routers/router.js
@@ -20,7 +20,7 @@ Checklist.Router = Ember.Router.extend({
         }
         Em.I18n.translations = Em.I18n.locales[locale];
         Ember.set('Em.I18n.currentLocale',  locale);
-        console.log('CURRENT LOCALE IS:', Em.I18n.currentLocale);
+        window.console && console.log('CURRENT LOCALE IS:', Em.I18n.currentLocale);
       },
 
       index: Ember.Route.extend({
@@ -44,7 +44,7 @@ Checklist.Router = Ember.Router.extend({
                 outletName: 'main', viewClass: Checklist.MainView
               });
             }, function(error){
-              console.log(error);
+              window.console && console.log(error);
             }
           );
         }
@@ -75,7 +75,7 @@ Checklist.Router = Ember.Router.extend({
                 outletName: 'main', viewClass: Checklist.MainView
               });
             }, function(error){
-              console.log(error);
+              window.console && console.log(error);
             }
           );
         }
@@ -92,7 +92,7 @@ Checklist.Router = Ember.Router.extend({
               outletName: 'main', viewClass: Checklist.AboutView
             });
           }, function(error) {
-            console.log(error);
+            window.console && console.log(error);
             router.transitionTo('index');
           });
         }
@@ -109,7 +109,7 @@ Checklist.Router = Ember.Router.extend({
               outletName: 'main', viewClass: Checklist.TermsOfUseView
             });
           }, function(error) {
-            console.log(error);
+            window.console && console.log(error);
             router.transitionTo('index');
           });
         }

From 87dd6962a60c0992d6ed3f36a1a189df603fd07c Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Tue, 29 Jul 2014 12:32:44 +0100
Subject: [PATCH 53/58] use ruby 2.0.0

---
 .ruby-version               |  1 +
 .rvmrc                      |  1 -
 config/deploy/production.rb | 16 ++++++++--------
 config/deploy/staging.rb    | 16 ++++++++--------
 4 files changed, 17 insertions(+), 17 deletions(-)
 create mode 100644 .ruby-version
 delete mode 100644 .rvmrc

diff --git a/.ruby-version b/.ruby-version
new file mode 100644
index 0000000..227cea2
--- /dev/null
+++ b/.ruby-version
@@ -0,0 +1 @@
+2.0.0
diff --git a/.rvmrc b/.rvmrc
deleted file mode 100644
index 35845a2..0000000
--- a/.rvmrc
+++ /dev/null
@@ -1 +0,0 @@
-rvm use 1.9.2
diff --git a/config/deploy/production.rb b/config/deploy/production.rb
index 2455813..2c88e3a 100644
--- a/config/deploy/production.rb
+++ b/config/deploy/production.rb
@@ -3,16 +3,16 @@
 set :domain, "unepwcmc-013.vm.brightbox.net"
 ## List of servers
 server "unepwcmc-013.vm.brightbox.net", :app, :web, :db, :primary => true
- 
+
 set :server_name, "#{application}.unepwcmc-013.vm.brightbox.net"
 set :sudo_user, "rails"
-set :app_port, "80" 
+set :app_port, "80"
 
 set :default_environment, {
-  'PATH' => "/home/rails/.rvm/gems/ruby-1.9.2-p320/bin:/home/rails/.rvm/bin:/home/rails/.rvm/rubies/ruby-1.9.2-p320/bin:$PATH",
-  'RUBY_VERSION' => 'ruby-1.9.2-p320',
-  'GEM_HOME' => '/home/rails/.rvm/gems/ruby-1.9.2-p320',
-  'GEM_PATH' => '/home/rails/.rvm/gems/ruby-1.9.2-p320',
+  'PATH' => "/home/rails/.rvm/gems/ruby-2.0.0-p481/bin:/home/rails/.rvm/bin:/home/rails/.rvm/rubies/ruby-2.0.0-p481/bin:$PATH",
+  'RUBY_VERSION' => 'ruby-2.0.0-p481',
+  'GEM_HOME' => '/home/rails/.rvm/gems/ruby-2.0.0-p481',
+  'GEM_PATH' => '/home/rails/.rvm/gems/ruby-2.0.0-p481',
 }
 
 desc "Configure VHost"
@@ -20,7 +20,7 @@
 vhost_config =<<-EOF
 server {
   listen 80;
-  
+
   client_max_body_size 4G;
   server_name #{application}.unepwcmc-013.vm.brightbox.net #{application}.sw01.matx.info;
   keepalive_timeout 5;
@@ -32,7 +32,7 @@
    expires max;
     add_header Cache-Control public;
   }
-  
+
   if (-f $document_root/system/maintenance.html) {
     return 503;
   }
diff --git a/config/deploy/staging.rb b/config/deploy/staging.rb
index f11f9e0..31a6e35 100644
--- a/config/deploy/staging.rb
+++ b/config/deploy/staging.rb
@@ -3,17 +3,17 @@
 set :domain, "unepwcmc-012.vm.brightbox.net"
 ## List of servers
 server "unepwcmc-012.vm.brightbox.net", :app, :web, :db, :primary => true
- 
+
 set :server_name, "#{application}.unepwcmc-012.vm.brightbox.net"
 set :sudo_user, "rails"
-set :app_port, "80" 
+set :app_port, "80"
 set :branch, :develop
 
 set :default_environment, {
-  'PATH' => "/home/rails/.rvm/gems/ruby-1.9.2-p320/bin:/home/rails/.rvm/bin:/home/rails/.rvm/rubies/ruby-1.9.2-p320/bin:$PATH",
-  'RUBY_VERSION' => 'ruby-1.9.2-p320',
-  'GEM_HOME' => '/home/rails/.rvm/gems/ruby-1.9.2-p320',
-  'GEM_PATH' => '/home/rails/.rvm/gems/ruby-1.9.2-p320',
+  'PATH' => "/home/rails/.rvm/gems/ruby-2.0.0-p481/bin:/home/rails/.rvm/bin:/home/rails/.rvm/rubies/ruby-2.0.0-p481/bin:$PATH",
+  'RUBY_VERSION' => 'ruby-2.0.0-p481',
+  'GEM_HOME' => '/home/rails/.rvm/gems/ruby-2.0.0-p481',
+  'GEM_PATH' => '/home/rails/.rvm/gems/ruby-2.0.0-p481',
 }
 
 desc "Configure VHost"
@@ -21,7 +21,7 @@
 vhost_config =<<-EOF
 server {
   listen 80;
-  
+
   client_max_body_size 4G;
   server_name #{application}.unepwcmc-012.vm.brightbox.net #{application}.sw01.matx.info;
   keepalive_timeout 5;
@@ -33,7 +33,7 @@
    expires max;
     add_header Cache-Control public;
   }
-  
+
   if (-f $document_root/system/maintenance.html) {
     return 503;
   }

From 4b2c228d28da60af314212ed0ce981c99ae6e73c Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Tue, 29 Jul 2014 14:10:20 +0100
Subject: [PATCH 54/58] removed unnecessary property setting

---
 .../controllers/taxon_concept_controller.js          | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/javascripts/controllers/taxon_concept_controller.js b/app/javascripts/controllers/taxon_concept_controller.js
index 656e6af..44c1201 100644
--- a/app/javascripts/controllers/taxon_concept_controller.js
+++ b/app/javascripts/controllers/taxon_concept_controller.js
@@ -6,16 +6,14 @@ Checklist.TaxonConceptController = Ember.ArrayController.extend({
   contentIds: function(){
     return this.get('content').objectAt(0).get('contentIds');
   }.property('content'),
-  contentHistory: null,
+
   contentDidChange: function(){
     if (this.get('content.isLoaded')){
       this.set('taxaCount', this.get('content').objectAt(0).get('total_cnt'));
-      this.set('contentHistory',
-        Checklist.store.find(
-          Checklist.TimelinesForTaxonConcept, {
-            taxon_concept_ids: this.get('contentIds'), locale: Em.I18n.currentLocale
-          }
-        )
+      Checklist.store.find(
+        Checklist.TimelinesForTaxonConcept, {
+          taxon_concept_ids: this.get('contentIds'), locale: Em.I18n.currentLocale
+        }
       );
     }
   }.observes('content.@each.isLoaded','contentIds'),

From c908b00fb5aa1672bb9b75534e1dd7ad4ff06975 Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Tue, 29 Jul 2014 17:11:22 +0100
Subject: [PATCH 55/58] rewritten the observer logic

---
 .../controllers/taxon_concept_controller.js   | 41 ++++++++++---------
 .../templates/main_view.handlebars            |  4 +-
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/app/javascripts/controllers/taxon_concept_controller.js b/app/javascripts/controllers/taxon_concept_controller.js
index 44c1201..41ae560 100644
--- a/app/javascripts/controllers/taxon_concept_controller.js
+++ b/app/javascripts/controllers/taxon_concept_controller.js
@@ -1,27 +1,28 @@
 Checklist.TaxonConceptController = Ember.ArrayController.extend({
-  content: [],
-
-  taxaCount: 0,
-
-  contentIds: function(){
-    return this.get('content').objectAt(0).get('contentIds');
-  }.property('content'),
-
-  contentDidChange: function(){
-    if (this.get('content.isLoaded')){
-      this.set('taxaCount', this.get('content').objectAt(0).get('total_cnt'));
+  refresh: function(params){
+    var that = this;
+    var promise = new RSVP.Promise();
+    var res = Checklist.store.find(
+      Checklist.Index,
+      $.extend({locale: Em.I18n.currentLocale}, params)
+    );
+    res.addObserver(
+      '@each.didLoad',
+      function(){
+        Ember.run.once(
+          this,
+          function() { promise.resolve(res); }
+        );
+       }
+    );
+    promise.then(function(taxon_concepts_index_ary){
+      that.set('content', taxon_concepts_index_ary);
+      var contentIds = taxon_concepts_index_ary.objectAt(0).get('contentIds');
       Checklist.store.find(
         Checklist.TimelinesForTaxonConcept, {
-          taxon_concept_ids: this.get('contentIds'), locale: Em.I18n.currentLocale
+          taxon_concept_ids: contentIds, locale: Em.I18n.currentLocale
         }
       );
-    }
-  }.observes('content.@each.isLoaded','contentIds'),
-
-  refresh: function(params) {
-    this.set('content', Checklist.store.find(
-      Checklist.Index,
-      $.extend({locale: Em.I18n.currentLocale}, params)
-    ));
+    });
   }
 });
diff --git a/app/javascripts/templates/main_view.handlebars b/app/javascripts/templates/main_view.handlebars
index 238507d..2e4f62d 100644
--- a/app/javascripts/templates/main_view.handlebars
+++ b/app/javascripts/templates/main_view.handlebars
@@ -10,9 +10,7 @@
   </div>
 
   <div class="aside" id="content-aside" style="display:none">
-    {{#with controllers.taxonConceptController.taxaCount}}
-      {{view Checklist.DownloadView}}
-    {{/with}}
+    {{view Checklist.DownloadView}}
 
     {{view Checklist.ReportView
       downloadControllerBinding="controllers.downloadController"}}

From 68a6e1bb6164727d9dc4eed99824227a124d539b Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Thu, 31 Jul 2014 12:52:34 +0100
Subject: [PATCH 56/58] reduced the use of recomputed properties in the
 timelines view

---
 app/javascripts/models/timeline.js                   |  5 ++---
 .../models/timelines_for_taxon_concept.js            |  5 +++--
 .../templates/taxon_concept_history_view.handlebars  |  6 +++---
 app/javascripts/templates/timeline_view.handlebars   |  4 ++--
 app/javascripts/views/taxon_concept_history_view.js  | 12 ------------
 app/javascripts/views/timeline_view.js               |  7 -------
 6 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/app/javascripts/models/timeline.js b/app/javascripts/models/timeline.js
index 4f4f546..89406aa 100644
--- a/app/javascripts/models/timeline.js
+++ b/app/javascripts/models/timeline.js
@@ -18,7 +18,6 @@ Checklist.Timeline = DS.Model.extend({
   timeline_intervals: DS.hasMany('Checklist.TimelineInterval', { embedded: true }),
   timelines: DS.hasMany('Checklist.Timeline', { embedded: true }),
   parties: DS.attr('array', { defaultValue: [] }),
-  hasNestedTimelines: function(){
-    return this.get('timelines.length') > 0;
-  }.property()
+  continuesInPresent: DS.attr('boolean'),
+  hasNestedTimelines: DS.attr('boolean')
 });
diff --git a/app/javascripts/models/timelines_for_taxon_concept.js b/app/javascripts/models/timelines_for_taxon_concept.js
index fc423fb..965b317 100644
--- a/app/javascripts/models/timelines_for_taxon_concept.js
+++ b/app/javascripts/models/timelines_for_taxon_concept.js
@@ -3,8 +3,9 @@ Checklist.TimelinesForTaxonConcept = DS.Model.extend({
   taxon_concept_id: DS.attr('number'),
   timelines: DS.hasMany('Checklist.Timeline', { embedded: true }),
   timeline_years: DS.hasMany('Checklist.TimelineYear', { embedded: true }),
-  has_descendant_timelines: DS.attr('boolean'),
-  has_events: DS.attr('boolean')
+  hasDescendantTimelines: DS.attr('boolean'),
+  hasEvents: DS.attr('boolean'),
+  hasReservations: DS.attr('boolean')
 });
 
 Checklist.TimelinesForTaxonConcept.reopenClass({
diff --git a/app/javascripts/templates/taxon_concept_history_view.handlebars b/app/javascripts/templates/taxon_concept_history_view.handlebars
index 2855882..be60016 100644
--- a/app/javascripts/templates/taxon_concept_history_view.handlebars
+++ b/app/javascripts/templates/taxon_concept_history_view.handlebars
@@ -1,4 +1,4 @@
-{{#unless has_events}}
+{{#unless hasEvents}}
   <div class="no-history-graphs">
     {{t timeline.nohistory}}
   </div>
@@ -8,7 +8,7 @@
   {{collection Checklist.TimelineView contentBinding="timelines"}}
   {{collection Checklist.TimelineYearListView contentBinding="timeline_years"}}
 
-  {{#if view.countryCount}}
+  {{#if hasReservations}}
     <a {{action "expandCountryTimeline" target="view"}} class="expandCountryTimeline">
       {{t timeline.party}}
     </a>
@@ -28,7 +28,7 @@
 </div>
 
 
-{{#if has_descendant_timelines}}
+{{#if hasDescendantTimelines}}
   <div class="sub-timeline-note">
     {{t timeline.split}}
   </div>
diff --git a/app/javascripts/templates/timeline_view.handlebars b/app/javascripts/templates/timeline_view.handlebars
index 1abc4cd..712d4b9 100644
--- a/app/javascripts/templates/timeline_view.handlebars
+++ b/app/javascripts/templates/timeline_view.handlebars
@@ -1,5 +1,5 @@
 <div class="row">
-  {{#unless view.isPartyTimeline}}
+  {{#unless party}}
     <div class="circle {{unbound view.colour}} category">{{unbound appendix}}</div>
   {{else}}
     <div class="circle {{unbound view.colour}} category party-tooltip" title="{{unbound party.name}}">
@@ -9,7 +9,7 @@
   {{collection Checklist.TimelineYearBarListView contentBinding="view.parentView.parentView.content.timeline_years"}}
   {{collection Checklist.TimelineIntervalListView contentBinding="timeline_intervals"}}
   {{collection Checklist.TimelineEventListView contentBinding="timeline_events"}}
-  {{#if view.continuesInPresent}}
+  {{#if continuesInPresent}}
     <div class="arrow {{unbound view.colour}}" style="right:3px"></div>
   {{/if}}
 </div>
diff --git a/app/javascripts/views/taxon_concept_history_view.js b/app/javascripts/views/taxon_concept_history_view.js
index ec23564..78938ca 100644
--- a/app/javascripts/views/taxon_concept_history_view.js
+++ b/app/javascripts/views/taxon_concept_history_view.js
@@ -11,21 +11,9 @@ Checklist.TaxonConceptHistoryView = Em.View.extend({
   leftOffsetInPixels: 50,
   rightOffsetInPixels: 8,
 
-  countryCount: 0,
-
   didInsertElement: function() {
     var that = this;
 
-    if (this.get('content.timelines').get('length')) {
-      var party_count = 0;
-
-      this.get('content.timelines').mapProperty('parties').forEach(function(item) {
-        party_count += item.length;
-      });
-
-      this.set('countryCount', party_count);
-    }
-
     // Namespace the resize events so that they can be removed when the
     // view is destroyed
     this.set('id', Checklist.Helpers.generateId());
diff --git a/app/javascripts/views/timeline_view.js b/app/javascripts/views/timeline_view.js
index d2de09b..044b150 100644
--- a/app/javascripts/views/timeline_view.js
+++ b/app/javascripts/views/timeline_view.js
@@ -24,13 +24,6 @@ Checklist.TimelineView = Ember.CollectionView.extend({
       }
     }.property(),
 
-    isPartyTimeline: function(){
-      return (this.get('content.party') !== null);
-    }.property(),
-    continuesInPresent: function(){
-      return this.get('content.timeline_intervals.lastObject.end_pos') == 1;
-    }.property(),
-
     didInsertElement: function() {
       this.$('.party-tooltip').hoverTooltip({
         positionTypeX: 'center',

From ae8a2351f5278b463e0909569acc6286ed2de9ca Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Fri, 1 Aug 2014 11:40:51 +0100
Subject: [PATCH 57/58] [#69105104] changed Spanish W -> RR

---
 app/javascripts/locales/es.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascripts/locales/es.js b/app/javascripts/locales/es.js
index 72a581e..5153daf 100644
--- a/app/javascripts/locales/es.js
+++ b/app/javascripts/locales/es.js
@@ -33,7 +33,7 @@ Em.I18n.locales.es = {
   'timeline.event.appendix': 'Apéndice {{appendix}} de la CITES',
   'timeline.event.symbol.amendment': 'A',
   'timeline.event.symbol.reservation': 'R',
-  'timeline.event.symbol.reservation_withdrawal': 'W',
+  'timeline.event.symbol.reservation_withdrawal': 'RR',
   'timeline.event.description.addition': 'APÉNDICE',
   'timeline.event.description.reservation': 'RESERVA',
   'timeline.event.description.reservation_withdrawal': 'RETIRO DE RESERVA',

From 68c207834f4b052c6dce80d6a2685598adaf8544 Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@unep-wcmc.org>
Date: Fri, 1 Aug 2014 13:07:58 +0100
Subject: [PATCH 58/58] [#75875626] translations for "No matches" in location
 dropdown

---
 app/javascripts/locales/en.js           | 1 +
 app/javascripts/locales/es.js           | 1 +
 app/javascripts/locales/fr.js           | 1 +
 app/javascripts/views/locations_view.js | 2 +-
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/javascripts/locales/en.js b/app/javascripts/locales/en.js
index 2bf83e8..ee613d0 100644
--- a/app/javascripts/locales/en.js
+++ b/app/javascripts/locales/en.js
@@ -15,6 +15,7 @@ Em.I18n.locales.en = {
   'search.by_location.selected': 'Selected Locations',
   'search.by_location.regions': 'Regions',
   'search.by_location.countries': 'Countries and territories',
+  'search.by_location.no_matches': 'No matches',
 
   'search.clear': 'Clear Search',
   'search.no_results': 'Your search did not match any taxa.',
diff --git a/app/javascripts/locales/es.js b/app/javascripts/locales/es.js
index 5153daf..ce3be77 100644
--- a/app/javascripts/locales/es.js
+++ b/app/javascripts/locales/es.js
@@ -15,6 +15,7 @@ Em.I18n.locales.es = {
   'search.by_location.selected': 'Ubicaciones seleccionadas',
   'search.by_location.regions': 'Regiones',
   'search.by_location.countries': 'Países y territorios',
+  'search.by_location.no_matches': 'No resultados',
 
   'search.clear': 'Borrar el resultado de la búsqueda',
   'search.no_results': 'Su búsqueda no encontró ningún taxón.',
diff --git a/app/javascripts/locales/fr.js b/app/javascripts/locales/fr.js
index c3dbfdb..e92678f 100644
--- a/app/javascripts/locales/fr.js
+++ b/app/javascripts/locales/fr.js
@@ -15,6 +15,7 @@ Em.I18n.locales.fr = {
   'search.by_location.selected': 'Localisations sélectionnées',
   'search.by_location.regions': 'Régions',
   'search.by_location.countries': 'Pays et territoires',
+  'search.by_location.no_matches': 'Aucun résultat',
 
   'search.clear': 'Effacer la recherche',
   'search.no_results': 'Aucun taxon ne correspond à votre recherche',
diff --git a/app/javascripts/views/locations_view.js b/app/javascripts/views/locations_view.js
index e007e24..c4438e1 100644
--- a/app/javascripts/views/locations_view.js
+++ b/app/javascripts/views/locations_view.js
@@ -49,7 +49,7 @@ Checklist.LocationsCollectionView = Ember.CollectionView.extend({
   locationType: null,
 
   emptyView: Ember.View.extend({
-    template: Ember.Handlebars.compile("No matches")
+    template: Ember.Handlebars.compile("{{t search.by_location.no_matches}}")
   }),
 
   itemViewClass: Ember.View.extend({