Merge branch 'release2.1' into manifest-layouts

ProjectMirador · Jun 24, 2016 · 8c50117 · 8c50117
2 parents 41d986e + ee143e9
commit 8c50117
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 10 deletions.
diff --git a/index.html b/index.html
@@ -49,7 +49,7 @@
            { "manifestUri": "http://iiif.biblissima.fr/manifests/ark:/12148/btv1b10500687r/manifest.json", "location": 'BnF'},
            { "manifestUri": "http://www.e-codices.unifr.ch/metadata/iiif/sl-0002/manifest.json", "location": 'e-codices'},
            { "manifestUri": "http://www.e-codices.unifr.ch/metadata/iiif/bge-cl0015/manifest.json", "location": 'e-codices'},
-           { "manifestUri": "http://dzkimgs.l.u-tokyo.ac.jp/iiif/zuzoubu/01/manifest.json", "location": "University of Tokyo"}
+           { "manifestUri": "http://dzkimgs.l.u-tokyo.ac.jp/iiif/zuzoubu/12b02/manifest.json", "location": "University of Tokyo"}
          ],
          "windowObjects": [],
          "annotationEndpoint": { "name":"Local Storage", "module": "LocalStorageEndpoint" }

diff --git a/js/src/viewer/manifestsPanel.js b/js/src/viewer/manifestsPanel.js
@@ -150,7 +150,7 @@
                   '<form action="" id="url-load-form">',
                     '<label for="url-loader">{{t "addNewObject"}}:</label>',
                     '<input type="text" id="url-loader" name="url-load" placeholder="http://...">',
-                    '<input type="submit" value="Load">',
+                    '<input type="submit" value="{{t "load"}}">',
                   '</form>',
                 '{{/if}}',
                 '<form action="" id="manifest-search-form">',

diff --git a/js/src/widgets/imageView.js b/js/src/widgets/imageView.js
@@ -402,9 +402,9 @@
           hideHUD();
           jQuery(_this.element).on('mousemove', function() {
             window.clearTimeout(timeoutID);
+            _this.element.find(".hud-control").stop(true, true).removeClass('hidden', fadeDuration);
             // When a user is in annotation create mode, force show the controls so they don't disappear when in a qtip, so check for that
             if (!_this.forceShowControls) {
-              _this.element.find(".hud-control").stop(true, true).removeClass('hidden', fadeDuration);
               timeoutID = window.setTimeout(hideHUD, timeoutDuration);
             }
           }).on('mouseleave', function() {

diff --git a/locales/fr/translation.json b/locales/fr/translation.json
@@ -1,10 +1,13 @@
 {
-    "addItem": "Ajouter un objet", 
+    "addItem": "Ajouter un objet",
     "changeLayout": "Changer la disposition",
-    "selectGrid": "Sélectionner une grille",
-    "bookmark": "Ajouter aux favoris",
+    "changeLayoutTooltip": "Changer le nombre de fenêtres visibles",
+    "selectGrid": "Sélectionner la grille de votre choix",
+    "bookmark": "Sauvegarder / Partager",
+    "bookmarkTooltip": "Obtenir le lien vers cet espace de travail",
     "close": "Fermer",
-    "bookmarkTitle": "Ajouter aux favoris ou partager son espace de travail",
+    "closeTooltip": "Fermer cette fenêtre",
+    "bookmarkTitle": "Sauvegarder ou partager cet espace de travail",
     "filterObjects": "Filtrer la liste",
     "addNewObject": "Ajouter un objet à partir d'une URL",
     "more": "restants",
@@ -33,7 +36,12 @@
     "newObject": "Nouvel objet",
     "objectMetadata": "Métadonnées",
     "fullScreen": "Plein écran",
+    "fullScreenTooltip": "Ouvrir en plein écran",
+    "fullScreenWindowTooltip": "Ouvrir cette fenêtre en plein écran",
     "logo": "Logo",
-    "load": "Charger",
-    "dropToLoad": "Déposer ici pour ajouter l'objet"
-}
+    "load": "Ajouter",
+    "dropToLoad": "Déposer ici pour ajouter l'objet",
+    "viewTypeTooltip": "Changer le type de vue",
+    "metadataTooltip": "Afficher les informations/métadonnées",
+    "sidePanelTooltip": "Ouvrir le panneau latéral"
+}
diff --git a/locales/ja/translation.json b/locales/ja/translation.json
@@ -0,0 +1,36 @@
+{
+    "addItem": "アイテム追加",
+    "changeLayout": "レイアウト変更",
+    "selectGrid": "以下のグリッドから選択",
+    "bookmark": "しおり",
+    "close": "閉じる",
+    "bookmarkTitle": "現在の表示内容を共有する",
+    "filterObjects": "フィルタをかける対象",
+    "addNewObject": "URLで新規オブジェクト追加",
+    "more": "もっと",
+    "item": "アイテム",
+    "items": "アイテム",
+    "details": "詳細",
+    "rights": "権利関係",
+    "rightsStatus": "権利状態",
+    "unspecified": "未特定の",
+    "links": "リンク",
+    "addSlotRight": "右にスロット追加",
+    "addSlotLeft": "左にスロット追加",
+    "addSlotAbove": "上にスロット追加",
+    "addSlotBelow": "下にスロット追加",
+    "imageView": "画像表示モード",
+    "bookView": "Book表示モード",
+    "scrollView": "スクロール表示モード",
+    "comments": "コメント",
+    "addTagsHere": "ここでタグを追加",
+    "save": "保存",
+    "cancel": "キャンセル",
+    "edit": "編集",
+    "delete": "削除",
+    "url": "URL",
+    "newObject": "新しいオブジェクト",
+    "objectMetadata": "オブジェクトのメタデータ",
+    "fullScreen": "全画面表示",
+    "logo": "ロゴ"
+}