[galaxy-commits] commit/galaxy-central: carlfeberhard: UI: rework zh and ja locale data

22 Apr 2014

1 new commit in galaxy-central:

https://bitbucket.org/galaxy/galaxy-central/commits/008c26226230/
Changeset:   008c26226230
User:        carlfeberhard
Date:        2014-04-22 17:58:22
Summary:     UI: rework zh and ja locale data
Affected #:  21 files

diff -r e7ec387cb3b3b8e6aaceade0c8bdd3da0077ac57 -r 008c26226230353a2440e6c7208de58575cfebff static/scripts/mvc/annotations.js

--- a/static/scripts/mvc/annotations.js
+++ b/static/scripts/mvc/annotations.js
@@ -1,6 +1,7 @@
 define([
-    "mvc/base-mvc"
-], function( baseMVC ){
+    "mvc/base-mvc",
+    "utils/localization"
+], function( baseMVC, _l ){
 // =============================================================================
 /** A view on any model that has a 'annotation' attribute
  */

diff -r e7ec387cb3b3b8e6aaceade0c8bdd3da0077ac57 -r 008c26226230353a2440e6c7208de58575cfebff static/scripts/mvc/dataset/hda-base.js
--- a/static/scripts/mvc/dataset/hda-base.js
+++ b/static/scripts/mvc/dataset/hda-base.js
@@ -239,8 +239,8 @@
         var menuId = 'dataset-' + this.model.get( 'id' ) + '-popup',
             html = [
                 '<div popupmenu="' + menuId + '">',
-                    '<a href="' + urls.download + '">', _l( 'Download Dataset' ), '</a>',
-                    '<a>' + _l( 'Additional Files' ) + '</a>',
+                    '<a href="' + urls.download + '">', _l( 'Download dataset' ), '</a>',
+                    '<a>' + _l( 'Additional files' ) + '</a>',
 
                     _.map( meta_files, function( meta_file ){
                         return [
@@ -647,13 +647,13 @@
             // purged and deleted
             '<% if( hda.purged ){ %>',
                 '<div class="dataset-purged-msg warningmessagesmall"><strong>',
-                    _l( 'This dataset has been deleted and removed from disk.' ),
+                    _l( 'This dataset has been deleted and removed from disk' ) + '.',
                 '</strong></div>',
 
             // deleted not purged
             '<% } else { %>',
                 '<div class="dataset-deleted-msg warningmessagesmall"><strong>',
-                    _l( 'This dataset has been deleted.' ),
+                    _l( 'This dataset has been deleted' ) + '.',
                 '</strong></div>',
             '<% } %>',
         '<% } %>',
@@ -661,7 +661,7 @@
         // hidden
         '<% if( !hda.visible ){ %>',
             '<div class="dataset-hidden-msg warningmessagesmall"><strong>',
-                _l( 'This dataset has been hidden.' ),
+                _l( 'This dataset has been hidden' ) + '.',
             '</strong></div>',
         '<% } %>',
     '</div>',

diff -r e7ec387cb3b3b8e6aaceade0c8bdd3da0077ac57 -r 008c26226230353a2440e6c7208de58575cfebff static/scripts/mvc/dataset/hda-edit.js
--- a/static/scripts/mvc/dataset/hda-edit.js
+++ b/static/scripts/mvc/dataset/hda-edit.js
@@ -223,7 +223,7 @@
 
         // No need for popup menu because there's a single visualization.
         if( visualizations.length === 1 ){
-            $icon.attr( 'data-original-title', _l( 'Visualize in ' ) + _l( titleCase( visualizations[0] ) ) );
+            $icon.attr( 'data-original-title', _l( 'Visualize in' ) + ' ' + _l( titleCase( visualizations[0] ) ) );
             $icon.click( create_viz_action( visualizations[0] ) );
 
         // >1: Populate menu dict with visualization fns, make the popupmenu
@@ -253,7 +253,7 @@
         // No need for popup menu because there's a single visualization.
         if( visualizations.length === 1 ) {
             var onlyVisualization = visualizations[0];
-            $icon.attr( 'data-original-title', _l( 'Visualize in ' ) + onlyVisualization.html );
+            $icon.attr( 'data-original-title', _l( 'Visualize in' ) + ' ' + onlyVisualization.html );
             $icon.attr( 'href', onlyVisualization.href );
 
         // >1: Populate menu dict with visualization fns, make the popupmenu
@@ -284,13 +284,20 @@
     _buildNewRender : function(){
         var $newRender = hdaBase.HDABaseView.prototype._buildNewRender.call( this );
 
-        //TODO: this won't localize easily
-        $newRender.find( '.dataset-deleted-msg' ).append(
-            _l( ' Click <a href="javascript:void(0);" class="dataset-undelete">here</a> to undelete it' +
-            ' or <a href="javascript:void(0);" class="dataset-purge">here</a> to immediately remove it from disk' ));
+//TODO: this won't localize easily
+        var br = '<br />', p = '.',
+            link = function( t, c ){
+                return [ '<a href="javascript:void(0)" class="', c, '">', t, '</a>' ].join( '' );
+            };
 
-        $newRender.find( '.dataset-hidden-msg' ).append(
-            _l( ' Click <a href="javascript:void(0);" class="dataset-unhide">here</a> to unhide it' ));
+        $newRender.find( '.dataset-deleted-msg' ).append([
+            br, link( _l( 'Undelete it' ), 'dataset-undelete' ), p,
+            br, link( _l( 'Permanently remove it from disk' ), 'dataset-purge' ), p
+        ].join( '' ));
+
+        $newRender.find( '.dataset-hidden-msg' ).append([
+            br, link( _l( 'Unhide it' ), 'dataset-unhide' ), p
+        ].join( '' ));
 
         return $newRender;
     },

diff -r e7ec387cb3b3b8e6aaceade0c8bdd3da0077ac57 -r 008c26226230353a2440e6c7208de58575cfebff static/scripts/mvc/history/current-history-panel.js
--- a/static/scripts/mvc/history/current-history-panel.js
+++ b/static/scripts/mvc/history/current-history-panel.js
@@ -221,7 +221,7 @@
             $emptyMsg.empty();
 
             $emptyMsg.html([
-                _l( 'This history is empty. ' ), _l( 'You can ' ),
+                _l( 'This history is empty' ), '. ', _l( 'You can ' ),
                 '<a class="uploader-link" href="javascript:void(0)">',
                     _l( 'load your own data' ),
                 '</a>',

diff -r e7ec387cb3b3b8e6aaceade0c8bdd3da0077ac57 -r 008c26226230353a2440e6c7208de58575cfebff static/scripts/mvc/history/history-panel.js
--- a/static/scripts/mvc/history/history-panel.js
+++ b/static/scripts/mvc/history/history-panel.js
@@ -137,7 +137,7 @@
                 panel.toggleHDAAnnotationEditors( false, panel.fxSpeed );
             },
             $activator      : faIconButton({
-                title   : _l( 'Edit history Annotation' ),
+                title   : _l( 'Edit history annotation' ),
                 classes : 'history-annotate-btn',
                 faIcon  : 'fa-comment'
             }).appendTo( $where.find( '.history-secondary-actions' ) )

diff -r e7ec387cb3b3b8e6aaceade0c8bdd3da0077ac57 -r 008c26226230353a2440e6c7208de58575cfebff static/scripts/mvc/history/readonly-history-panel.js
--- a/static/scripts/mvc/history/readonly-history-panel.js
+++ b/static/scripts/mvc/history/readonly-history-panel.js
@@ -249,7 +249,7 @@
     /** Modify an error message to be fancy and wear a monocle. */
     _bePolite : function( msg ){
         msg = msg || _l( 'An error occurred while getting updates from the server' );
-        return msg + '. ' + _l( 'Please contact a Galaxy administrator if the problem persists.' );
+        return msg + '. ' + _l( 'Please contact a Galaxy administrator if the problem persists' ) + '.';
     },
 
     // ------------------------------------------------------------------------ loading history/hda models
@@ -284,6 +284,7 @@
         return panel._loadHistoryFromXHR( xhr, attributes )
             .fail( function( xhr, where, history ){
                 // throw an error up for the error handler
+//TODO: difficult to localize - use template
                 panel.trigger( 'error', panel, xhr, attributes, _l( 'An error was encountered while ' + where ),
                     { historyId: historyId, history: history || {} });
             })
@@ -1002,8 +1003,8 @@
         '</div>',
 
         '<div class="quota-message errormessage">',
-            _l( 'You are over your disk quota.' ),
-            _l( 'Tool execution is on hold until your disk usage drops below your allocated quota.' ),
+            _l( 'You are over your disk quota' ), '. ',
+            _l( 'Tool execution is on hold until your disk usage drops below your allocated quota' ), '.',
         '</div>',
 
         '<div class="tags-display"></div>',
@@ -1024,7 +1025,7 @@
     // where the datasets/hdas are added
     '<div class="datasets-list"></div>',
     '<div class="empty-history-message infomessagesmall">',
-        _l( 'Your history is empty. Click \'Get Data\' on the left pane to start' ),
+        _l( 'This history is empty' ),
     '</div>'
 ].join( '' );
 

diff -r e7ec387cb3b3b8e6aaceade0c8bdd3da0077ac57 -r 008c26226230353a2440e6c7208de58575cfebff static/scripts/mvc/tags.js
--- a/static/scripts/mvc/tags.js
+++ b/static/scripts/mvc/tags.js
@@ -1,6 +1,7 @@
 define([
-    "mvc/base-mvc"
-], function( baseMVC ){
+    "mvc/base-mvc",
+    "utils/localization"
+], function( baseMVC, _l ){
 // =============================================================================
 /** A view on any model that has a 'tags' attribute (a list of tag strings)
  *      Incorporates the select2 jQuery plugin for tags display/editing:

diff -r e7ec387cb3b3b8e6aaceade0c8bdd3da0077ac57 -r 008c26226230353a2440e6c7208de58575cfebff static/scripts/nls/ja/locale.js
--- a/static/scripts/nls/ja/locale.js
+++ b/static/scripts/nls/ja/locale.js
@@ -1,389 +1,217 @@
 /** ja localization */
 define({
 
-// templates/history/options.mako:24
-"Are you sure you want to delete the current history?" :
-"現在のヒストリーを消すことに同意しますか？",
+// ---------------------------------------------------------------------------- histories
+// ---- history-model
+// ---- readonly-history-panel
+"This history is empty" :
+"ヒストリーは空です",
+"No matching datasets found" :
+"一致するデータセットが見つかりませんでした",
+//"An error occurred while getting updates from the server" :
+//false,
+//"Please contact a Galaxy administrator if the problem persists" :
+//false,
+//TODO:
+//"An error was encountered while <% where %>" :
+//false,
+"Search datasets" :
+"データセットを検索する",
+"You are currently viewing a deleted history!" :
+"消去したヒストリーをみています。",
+"You are over your disk quota" :
+"あなたはディスククォータを超えている",
+//"Tool execution is on hold until your disk usage drops below your allocated quota" :
+//false,
+"All" :
+"一式",
+"None" :
+"なし",
+"For all selected" :
+"各項目を",
 
-// templates/root/history.mako:38
-"collapse all" :
-"すべてをおりたたむ",
+// ---- history-panel
+//"Edit history tags" :
+//false,
+//"Edit history Annotation" :
+//false,
+"Click to rename history" :
+"ヒストリーの名前を変更するにはクリック",
+// multi operations
+"Operations on multiple datasets" :
+"複数のデータセットに対する操作",
+//"Hide datasets" :
+//false,
+//"Unhide datasets" :
+//false,
+//"Delete datasets" :
+//false,
+//"Undelete datasets" :
+//false,
+"Permanently delete datasets" :
+"永久にデータセットを削除",
+"This will permanently remove the data in your datasets. Are you sure?" :
+"これは永久にあなたのデータセット内のデータを削除します。本当に？",
 
-// templates/dataset/edit_attributes.mako:2
-"History Item Attributes" :
-"ヒストリーアイテム変数",
+// ---- annotated-history-panel
+"Dataset" :
+"データセット",
+//"Annotation" :
+//false,
 
-// templates/dataset/edit_attributes.mako:19
-"Edit Attributes" :
+// ---- current-history-panel
+"This history is empty. Click 'Get Data' on the left tool menu to start" :
+"ヒストリーは空です。解析をはじめるには、左パネルの 'データ取得' をクリック",
+"No matching datasets found" :
+"一致するデータセットが見つかりませんでした",
+"You must be logged in to create histories" :
+"ヒストリーを作成するためにはログインする必要があります",
+//TODO:
+//"You can <% loadYourOwn %> or <% externalSource %>" :
+//false,
+//"load your own data" :
+//false,
+//"get data from an external source" :
+//false,
+
+// these aren't in zh/ginga.po and the template doesn't localize
+//"Include Deleted Datasets" :
+//false,
+//"Include Hidden Datasets" :
+//false,
+
+
+// ---------------------------------------------------------------------------- datasets
+// ---- hda-model
+//"Unable to purge dataset" :
+//false,
+
+// ---- hda-base
+// display button
+//"Cannot display datasets removed from disk" :
+//false,
+//"This dataset must finish uploading before it can be viewed" :
+//false,
+//"This dataset is not yet viewable" :
+//false,
+"View data" :
+"データを表示",
+// download button
+"Download" :
+"ダウンロード",
+"Download dataset" :
+"データセットをダウンロード",
+//"Additional files" :
+//false,
+// info/show_params
+"View details" :
+"細部を表示",
+
+// dataset states
+// state: new
+//"This is a new dataset and not all of its data are available yet" :
+//false,
+// state: noPermission
+//"You do not have permission to view this dataset" :
+//false,
+// state: discarded
+//"The job creating this dataset was cancelled before completion" :
+//false,
+// state: queued
+"This job is waiting to run" :
+"ジョブは実行待ちです",
+// state: upload
+//"This dataset is currently uploading" :
+//false,
+// state: setting_metadata
+//"Metadata is being auto-detected" :
+//false,
+// state: running
+"This job is currently running" :
+"ジョブは実行中です",
+// state: paused
+//"This job is paused. Use the \"Resume Paused Jobs\" in the history menu to resume" :
+//false,
+// state: error
+"An error occurred with this dataset" :
+"このジョブの実行中に発生したエラー",
+// state: empty
+"No data" :
+"データ無し",
+// state: failed_metadata
+//"An error occurred setting the metadata for this dataset" :
+//false,
+
+// ajax error prefix
+//"There was an error getting the data for this dataset" :
+//false,
+
+// purged'd/del'd msg
+"This dataset has been deleted and removed from disk" :
+"このデータセットは、永続的にディスクから削除されました",
+"This dataset has been deleted" :
+"このデータセットは削除されました",
+"This dataset has been hidden" :
+"このデータセットは、非表示にされた",
+
+"format" :
+"フォーマット",
+"database" :
+"データベース",
+
+// ---- hda-edit
+"Edit attributes" :
 "変数を編集する",
+//"Cannot edit attributes of datasets removed from disk" :
+//false,
+//"Undelete dataset to edit attributes" :
+//false,
+//"This dataset must finish uploading before it can be edited" :
+//false,
+//"This dataset is not yet editable" :
+//false,
 
-// templates/dataset/edit_attributes.mako:64
-"This will inspect the dataset and attempt to correct the above column values if they are not accurate." :
-"これはデータセットを調査して上記のカラムの値を修正することを試みます。",
-
-// templates/dataset/edit_attributes.mako:68
-"Required metadata values are missing. Some of these values may not be editable by the user. Selecting \"Auto-detect\" will attempt to fix these values." :
-"必要なメタデータの値が不明です。それらのいくつかの値はユーザによって編集可能にはなっていません。「自動判定」を選択するとそれらの値をただしくできるかもしれません。",
-
-// templates/dataset/edit_attributes.mako:78
-"Convert to new format" :
-"新しいフォーマットに変換する",
-
-// templates/dataset/edit_attributes.mako:84
-"Convert to" :
-"変換する",
-
-// templates/dataset/edit_attributes.mako:95
-"This will create a new dataset with the contents of this dataset converted to a new format." :
-"新しいフォーマットに変換したデータセットを新規作成します。",
-
-// templates/dataset/edit_attributes.mako:111
-"Change data type" :
-"データタイプを変更する",
-
-// templates/dataset/edit_attributes.mako:117
-"New Type" :
-"新しいタイプ",
-
-// templates/dataset/edit_attributes.mako:124
-"This will change the datatype of the existing dataset but <i>not</i> modify its contents. Use this if Galaxy has incorrectly guessed the type of your dataset." :
-"これは既存のデータセットのデータタイプを変更します。しかしデータセットの中身は変更しません。データセットのタイプの誤判定があったときに使用します。",
-
-// templates/dataset/edit_attributes.mako:137
-"Copy History Item" :
-"ヒストリーアイテムをコピーする",
-
-// templates/history/list.mako:3
-"Your saved histories" :
-"保存したヒストリー",
-
-// templates/history/list.mako:19
-"Stored Histories" :
-"格納してあるヒストリー",
-
-// templates/history/list.mako:21 templates/root/history.mako:239
-"hide deleted" :
-"削除したヒストリーを隠す",
-
-// templates/history/list.mako:23
-"show deleted" :
-"削除したヒストリーを表示する",
-
-// templates/history/list.mako:27
-"Name" :
-"名前",
-
-// templates/history/list.mako:27
-"Size" :
-"サイズ",
-
-// templates/history/list.mako:27
-"Last modified" :
-"最終更新日",
-
-// templates/history/list.mako:27
-"Actions" :
-"操作",
-
-// templates/history/list.mako:45
-"rename" :
-"名称変更する",
-
-// templates/history/list.mako:46
-"switch to" :
-"変更する",
-
-// templates/history/list.mako:47
-"delete" :
-"削除する",
-
-// templates/history/list.mako:49
-"undelete" :
-"削除から戻す",
-
-// templates/history/list.mako:55
-"Action" :
-"操作",
-
-// templates/history/list.mako:56 templates/history/options.mako:21
-"Share" :
-"共有",
-
-// templates/history/list.mako:56 templates/history/options.mako:15
-"Rename" :
-"名称変更する",
-
-// templates/history/list.mako:56 templates/history/options.mako:24
 "Delete" :
 "削除する",
+//"Dataset is already deleted" :
+//false,
 
-// templates/history/list.mako:58
-"Undelete" :
-"削除から戻す",
+"View or report this error" :
+"このエラーを届け出る",
 
-// templates/history/list.mako:65
-"You have no stored histories" :
-"保管してあるヒストリーはありません",
+"Run this job again" :
+"もう一度このジョブを実行する",
 
-// templates/history/options.mako:5
-"History Options" :
-"ヒストリーオプション",
+"Visualize" :
+"可視化する",
+//"Visualize in" :
+//false,
 
-// templates/history/options.mako:9
-"You must be " :
-"あなたは",
+"Undelete it" :
+"復元する",
+"Permanently remove it from disk" :
+"永久にディスクから削除",
+"Unhide it" :
+"非表示解除する",
 
-// templates/history/options.mako:9
-"logged in" :
-"ログイン",
+//"You may be able to" :
+//false,
+//"set it manually or retry auto-detection" :
+//false,
 
-// templates/history/options.mako:9
-" to store or switch histories." :
-"しないとヒストリーの保管や変更ができません。",
+//"Edit dataset tags" :
+//false,
+//"Edit dataset annotation" :
+//false,
 
-// templates/history/options.mako:15
-// python-format
-" current history (stored as \"%s\")" :
-" 現在のヒストリー（\"%s\" として保管されています）",
 
-// templates/history/options.mako:16
-"List" :
-"リストする",
+// ---------------------------------------------------------------------------- misc. MVC
+//"Tags" :
+//false,
+//"Annotation" :
+//false,
+//"Edit annotation" :
+//false,
 
-// templates/history/options.mako:16
-" previously stored histories" :
-" 以前に保管したヒストリー",
 
-// templates/history/options.mako:18
-"Create" :
-"作成する",
-
-// templates/history/options.mako:18
-" a new empty history" :
-" 新規ヒストリー",
-
-// templates/history/options.mako:20
-"Construct workflow" :
-"ワークフローを構築する",
-
-// templates/history/options.mako:20
-" from the current history" :
-" 現在のヒストリーから",
-
-// templates/history/options.mako:21 templates/history/options.mako:24
-" current history" :
-" 現在のヒストリー",
-
-// templates/history/options.mako:23
-"Show deleted" :
-"削除したヒストリーを表示する",
-
-// templates/history/options.mako:23
-" datasets in history" :
-" ヒストリーのデータセット",
-
-// templates/history/rename.mako:3 templates/history/rename.mako:6
-"Rename History" :
-"ヒストリーの名称変更をする",
-
-
-"Rename Histories" :
-"名称変更する",
-
-"Perform Action" :
-"操作を実行する",
-
-"Submit" :
-"登録する",
-
-
-
-// templates/history/rename.mako:10
-"Current Name" :
-"現在の名称",
-
-// templates/history/rename.mako:10
-"New Name" :
-"新しい名称",
-
-// templates/history/share.mako:3
-"Share histories" :
-"ヒストリーを共有する",
-
-// templates/history/share.mako:6
-"Share Histories" :
-"ヒストリーを共有する",
-
-// templates/history/share.mako:9
-"History Name:" :
-"ヒストリー名",
-
-// templates/history/share.mako:9
-"Number of Datasets:" :
-"データセット数",
-
-// templates/history/share.mako:9
-"Share Link" :
-"共有リンク",
-
-// templates/history/share.mako:15
-"This history contains no data." :
-"このヒストリーにはデータがありません。",
-
-// templates/history/share.mako:21
-"copy link to share" :
-"共有リンクをコピーする",
-
-// templates/history/share.mako:24
-"Email of User to share with:" :
-"共有したいユーザのEメール:",
-//"つぎのヒストリーを共有するユーザのEメールアドレス:"
-
-// templates/root/history.mako:7
-"Galaxy History" :
-"Galaxy ヒストリー",
-
-// templates/root/history.mako:237
-"refresh" :
-"リフレッシュ",
-
-// templates/root/history.mako:245
-"You are currently viewing a deleted history!" :
-"消去したヒストリーをみています。",
-
-// templates/root/history.mako:289
-"Your history is empty. Click 'Get Data' on the left pane to start" :
-"ヒストリーは空です。解析をはじめるには、左パネルの 'データ取得' をクリック",
-
-// templates/root/history_common.mako:41
-"Job is waiting to run" :
-"ジョブは実行待ちです",
-
-// templates/root/history_common.mako:43
-"Job is currently running" :
-"ジョブは実行中です",
-
-// templates/root/history_common.mako:46
-"An error occurred running this job: " :
-"このジョブの実行中に発生したエラー: ",
-
-// templates/root/history_common.mako:47
-"report this error" :
-"このエラーを報告する",
-
-// templates/root/history_common.mako:54
-"No data: " :
-"データ無し: ",
-
-// templates/root/history_common.mako:58
-"format: " :
-"フォーマット: ",
-
-// templates/root/history_common.mako:59
-"database: " :
-"データベース: ",
-
-// templates/root/history_common.mako:66 templates/root/masthead.mako:20
-"Info: " :
-"情報: ",
-
-// templates/root/history_common.mako:85
-// python-format
-"Error: unknown dataset state \"%s\"." :
-"エラー: 不明なデータ状態 \"%s\"。",
-
-// templates/root/index.mako:32
-"Options" :
-"オプション",
-
-// templates/root/index.mako:34
-"History" :
-"ヒストリー",
-
-// templates/root/masthead.mako:20
-"report bugs" :
-"バグを報告する",
-
-// templates/root/masthead.mako:21
-"wiki" :
-"wiki",
-
-// templates/root/masthead.mako:22
-"screencasts" :
-"スクリーンキャスト",
-
-// templates/root/masthead.mako:23
-"blog" :
-"ブログ",
-
-// templates/root/masthead.mako:31
-// python-format
-"Logged in as %s: " :
-"%s としてログイン中: ",
-
-// templates/root/masthead.mako:31
-"manage" :
-"管理",
-
-// templates/root/masthead.mako:32
-"logout" :
-"ログアウト",
-
-// templates/root/masthead.mako:34
-"Account: " :
-"アカウント: ",
-
-// templates/root/masthead.mako:34
-"create" :
-"作成",
-
-// templates/root/masthead.mako:35
-"login" :
-"ログイン",
-
-// templates/root/tool_menu.mako:52
-"Galaxy Tools" :
-"Galaxy ツール群",
-
-// templates/root/tool_menu.mako:129
-"Workflow" :
-"ワークフロー",
-
-// templates/root/tool_menu.mako:134
-"Manage" :
-"管理",
-
-// templates/root/tool_menu.mako:134
-"workflows" :
-"ワークフロー",
-
-// templates/user/index.mako:2 templates/user/index.mako:4
-"Account settings" :
-"アカウント設定",
-
-// templates/user/index.mako:7
-// python-format
-"You are currently logged in as %s." :
-"%s としてログイン中。",
-
-// templates/user/index.mako:9
-"Change your password" :
-"パスワード変更",
-
-// templates/user/index.mako:10
-"Update your email address" :
-"メールアドレス変更",
-
-// templates/user/index.mako:11
-"Logout" :
-"ログアウト",
-
-// templates/user/index.mako:16
-"Login" :
-"ログイン",
-
-// templates/user/index.mako:17
-"Create new account" :
-"新規アカウントを作成する"
-
-})
+});

diff -r e7ec387cb3b3b8e6aaceade0c8bdd3da0077ac57 -r 008c26226230353a2440e6c7208de58575cfebff static/scripts/nls/locale.js
--- a/static/scripts/nls/locale.js
+++ b/static/scripts/nls/locale.js
@@ -1,514 +1,219 @@
 /** en/main localization hash - for use with requirejs' i18n plugin */
 define({
     root : {
-// ---------------------------------------------------------------------------- localized
-"history" :
+
+// ---------------------------------------------------------------------------- histories
+// ---- history-model
+// ---- readonly-history-panel
+"This history is empty" :
+false,
+"No matching datasets found" :
+false,
+"An error occurred while getting updates from the server" :
+false,
+"Please contact a Galaxy administrator if the problem persists" :
+false,
+//TODO:
+//"An error was encountered while <% where %>" :
+//false,
+"Search datasets" :
+false,
+"You are currently viewing a deleted history!" :
+false,
+"You are over your disk quota" :
+false,
+"Tool execution is on hold until your disk usage drops below your allocated quota" :
+false,
+"All" :
+false,
+"None" :
+false,
+"For all selected" :
 false,
 
-// templates/history/options.mako:24
-"Are you sure you want to delete the current history?" :
+// ---- history-panel
+"Edit history tags" :
+false,
+"Edit history Annotation" :
+false,
+"Click to rename history" :
+false,
+// multi operations
+"Operations on multiple datasets" :
+false,
+"Hide datasets" :
+false,
+"Unhide datasets" :
+false,
+"Delete datasets" :
+false,
+"Undelete datasets" :
+false,
+"Permanently delete datasets" :
+false,
+"This will permanently remove the data in your datasets. Are you sure?" :
 false,
 
-// templates/root/history.mako:38
-"collapse all" :
+// ---- annotated-history-panel
+"Dataset" :
+false,
+"Annotation" :
 false,
 
-// templates/dataset/edit_attributes.mako:2
-"History Item Attributes" :
+// ---- current-history-panel
+"This history is empty. Click 'Get Data' on the left tool menu to start" :
+false,
+"No matching datasets found" :
+false,
+"You must be logged in to create histories" :
+false,
+//TODO:
+//"You can <% loadYourOwn %> or <% externalSource %>" :
+//false,
+//"load your own data" :
+//false,
+//"get data from an external source" :
+//false,
+
+// these aren't in zh/ginga.po and the template doesn't localize
+//"Include Deleted Datasets" :
+//false,
+//"Include Hidden Datasets" :
+//false,
+
+
+// ---------------------------------------------------------------------------- datasets
+// ---- hda-model
+"Unable to purge dataset" :
 false,
 
-// templates/dataset/edit_attributes.mako:19
-"Edit Attributes" :
+// ---- hda-base
+// display button
+"Cannot display datasets removed from disk" :
+false,
+"This dataset must finish uploading before it can be viewed" :
+false,
+"This dataset is not yet viewable" :
+false,
+"View data" :
+false,
+// download button
+"Download" :
+false,
+"Download dataset" :
+false,
+"Additional files" :
+false,
+// info/show_params
+"View details" :
 false,
 
-// templates/dataset/edit_attributes.mako:64
-"This will inspect the dataset and attempt to correct the above column values if they are not accurate." :
+// dataset states
+// state: new
+"This is a new dataset and not all of its data are available yet" :
+false,
+// state: noPermission
+"You do not have permission to view this dataset" :
+false,
+// state: discarded
+"The job creating this dataset was cancelled before completion" :
+false,
+// state: queued
+"This job is waiting to run" :
+false,
+// state: upload
+"This dataset is currently uploading" :
+false,
+// state: setting_metadata
+"Metadata is being auto-detected" :
+false,
+// state: running
+"This job is currently running" :
+false,
+// state: paused
+"This job is paused. Use the \"Resume Paused Jobs\" in the history menu to resume" :
+false,
+// state: error
+"An error occurred with this dataset" :
+false,
+// state: empty
+"No data" :
+false,
+// state: failed_metadata
+"An error occurred setting the metadata for this dataset" :
 false,
 
-// templates/dataset/edit_attributes.mako:68
-"Required metadata values are missing. Some of these values may not be editable by the user. Selecting \"Auto-detect\" will attempt to fix these values." :
-false,
-
-// templates/dataset/edit_attributes.mako:78
-"Convert to new format" :
-false,
-
-// templates/dataset/edit_attributes.mako:84
-"Convert to" :
-false,
-
-// templates/dataset/edit_attributes.mako:95
-"This will create a new dataset with the contents of this dataset converted to a new format." :
-false,
-
-// templates/dataset/edit_attributes.mako:111
-"Change data type" :
-false,
-
-// templates/dataset/edit_attributes.mako:117
-"New Type" :
-false,
-
-// templates/dataset/edit_attributes.mako:124
-"This will change the datatype of the existing dataset but <i>not</i> modify its contents. Use this if Galaxy has incorrectly guessed the type of your dataset." :
-false,
-
-// templates/dataset/edit_attributes.mako:137
-"Copy History Item" :
-false,
-
-// templates/history/list.mako:3
-"Your saved histories" :
-false,
-
-// templates/history/list.mako:19
-"Stored Histories" :
-false,
-
-// templates/history/list.mako:21 templates/root/history.mako:239
-"hide deleted" :
-false,
-
-// templates/history/list.mako:23
-"show deleted" :
-false,
-
-// templates/history/list.mako:27
-"Name" :
-false,
-
-// templates/history/list.mako:27
-"Size" :
-false,
-
-// templates/history/list.mako:27
-"Last modified" :
-false,
-
-// templates/history/list.mako:27
-"Actions" :
-false,
-
-// templates/history/list.mako:45
-"rename" :
-false,
-
-// templates/history/list.mako:46
-"switch to" :
-false,
-
-// templates/history/list.mako:47
-"delete" :
-false,
-
-// templates/history/list.mako:49
-"undelete" :
-false,
-
-// templates/history/list.mako:55
-"Action" :
-false,
-
-// templates/history/list.mako:56 templates/history/options.mako:21
-"Share" :
-false,
-
-// templates/history/list.mako:56 templates/history/options.mako:15
-"Rename" :
-false,
-
-// templates/history/list.mako:56 templates/history/options.mako:24
-"Delete" :
-false,
-
-// templates/history/list.mako:58
-"Undelete" :
-false,
-
-// templates/history/list.mako:65
-"You have no stored histories" :
-false,
-
-// templates/history/options.mako:5
-"History Options" :
-false,
-
-// templates/history/options.mako:9
-"You must be " :
-false,
-
-// templates/history/options.mako:9
-"logged in" :
-false,
-
-// templates/history/options.mako:9
-" to store or switch histories." :
-false,
-
-// templates/history/options.mako:15
-// python-format
-" current history (stored as \"%s\")" :
-false,
-
-// templates/history/options.mako:16
-"List" :
-false,
-
-// templates/history/options.mako:16
-" previously stored histories" :
-false,
-
-// templates/history/options.mako:18
-"Create" :
-false,
-
-// templates/history/options.mako:18
-" a new empty history" :
-false,
-
-// templates/history/options.mako:20
-"Construct workflow" :
-false,
-
-// templates/history/options.mako:20
-" from the current history" :
-false,
-
-// templates/history/options.mako:21 templates/history/options.mako:24
-" current history" :
-false,
-
-// templates/history/options.mako:23
-"Show deleted" :
-false,
-
-// templates/history/options.mako:23
-" datasets in history" :
-false,
-
-// templates/history/rename.mako:3 templates/history/rename.mako:6
-"Rename History" :
-false,
-
-
-"Rename Histories" :
-false,
-
-"Perform Action" :
-false,
-
-"Submit" :
-false,
-
-// templates/history/rename.mako:10
-"Current Name" :
-false,
-
-// templates/history/rename.mako:10
-"New Name" :
-false,
-
-// templates/history/share.mako:3
-"Share histories" :
-false,
-
-// templates/history/share.mako:6
-"Share Histories" :
-false,
-
-// templates/history/share.mako:9
-"History Name:" :
-false,
-
-// templates/history/share.mako:9
-"Number of Datasets:" :
-false,
-
-// templates/history/share.mako:9
-"Share Link" :
-false,
-
-// templates/history/share.mako:15
-"This history contains no data." :
-false,
-
-// templates/history/share.mako:21
-"copy link to share" :
-false,
-
-// templates/history/share.mako:24
-"Email of User to share with:" :
-false,
-
-// templates/root/history.mako:7
-"Galaxy History" :
-false,
-
-// templates/root/history.mako:237
-"refresh" :
-false,
-
-// templates/root/history.mako:245
-"You are currently viewing a deleted history!" :
-false,
-
-// templates/root/history.mako:289
-"Your history is empty. Click 'Get Data' on the left pane to start" :
-false,
-
-// templates/root/history_common.mako:41
-"Job is waiting to run" :
-false,
-
-// templates/root/history_common.mako:43
-"Job is currently running" :
-false,
-
-// templates/root/history_common.mako:46
-"An error occurred running this job: " :
-false,
-
-// templates/root/history_common.mako:47
-"report this error" :
-false,
-
-// templates/root/history_common.mako:54
-"No data: " :
-false,
-
-// templates/root/history_common.mako:58
-"format: " :
-false,
-
-// templates/root/history_common.mako:59
-"database: " :
-false,
-
-// templates/root/history_common.mako:66 templates/root/masthead.mako:20
-"Info: " :
-false,
-
-// templates/root/history_common.mako:85
-// python-format
-"Error: unknown dataset state \"%s\"." :
-false,
-
-// templates/root/index.mako:32
-"Options" :
-false,
-
-// templates/root/index.mako:34
-"History" :
-false,
-
-// templates/root/masthead.mako:20
-"report bugs" :
-false,
-
-// templates/root/masthead.mako:21
-"wiki" :
-false,
-
-// templates/root/masthead.mako:22
-"screencasts" :
-false,
-
-// templates/root/masthead.mako:23
-"blog" :
-false,
-
-// templates/root/masthead.mako:31
-// python-format
-"Logged in as %s: " :
-false,
-
-// templates/root/masthead.mako:31
-"manage" :
-false,
-
-// templates/root/masthead.mako:32
-"logout" :
-false,
-
-// templates/root/masthead.mako:34
-"Account: " :
-false,
-
-// templates/root/masthead.mako:34
-"create" :
-false,
-
-// templates/root/masthead.mako:35
-"login" :
-false,
-
-// templates/root/tool_menu.mako:52
-"Galaxy Tools" :
-false,
-
-// templates/root/tool_menu.mako:129
-"Workflow" :
-false,
-
-// templates/root/tool_menu.mako:134
-"Manage" :
-false,
-
-// templates/root/tool_menu.mako:134
-"workflows" :
-false,
-
-// templates/user/index.mako:2 templates/user/index.mako:4
-"Account settings" :
-false,
-
-// templates/user/index.mako:7
-// python-format
-"You are currently logged in as %s." :
-false,
-
-// templates/user/index.mako:9
-"Change your password" :
-false,
-
-// templates/user/index.mako:10
-"Update your email address" :
-false,
-
-// templates/user/index.mako:11
-"Logout" :
-false,
-
-// templates/user/index.mako:16
-"Login" :
-false,
-
-// templates/user/index.mako:17
-"Create new account" :
-false,
-
-
-// ---------------------------------------------------------------------------- need to be localized
-"anonymous user" :
-false,
-
-"Using " :
-false,
-
+// ajax error prefix
 "There was an error getting the data for this dataset" :
 false,
 
-"This dataset has been deleted and removed from disk." :
+// purged'd/del'd msg
+"This dataset has been deleted and removed from disk" :
 false,
-
-"This dataset has been deleted." :
+"This dataset has been deleted" :
 false,
-
-"This dataset has been hidden." :
+"This dataset has been hidden" :
 false,
 
 "format" :
 false,
-
 "database" :
 false,
 
-"This history is empty" :
+// ---- hda-edit
+"Edit attributes" :
+false,
+"Cannot edit attributes of datasets removed from disk" :
+false,
+"Undelete dataset to edit attributes" :
+false,
+"This dataset must finish uploading before it can be edited" :
+false,
+"This dataset is not yet editable" :
 false,
 
-"No matching datasets found" :
+"Delete" :
+false,
+"Dataset is already deleted" :
 false,
 
-"You are over your disk quota." :
-false,
-
-"Tool execution is on hold until your disk usage drops below your allocated quota." :
-false,
-
-"All" :
-false,
-
-"None" :
-false,
-
-"For all selected" :
-false,
-
-"This history is empty. Click 'Get Data' on the left tool menu to start" :
-false,
-
-"Include Deleted Datasets" :
-false,
-
-"Include Hidden Datasets" :
-false,
-
-"Edit history tags" :
-false,
-
-"Edit history Annotation" :
-false,
-
-"Operations on multiple datasets" :
-false,
-
-"Search datasets" :
-false,
-
-"clear search (esc)" :
-false,
-
-"loading..." :
-false,
-
-"Hide datasets" :
-false,
-
-"Unhide datasets" :
-false,
-
-"Delete datasets" :
-false,
-
-"Undelete datasets" :
-false,
-
-"Permanently delete datasets" :
-false,
-
-"Click to rename history" :
-false,
-
-"View data" :
-false,
-
-"Edit attributes" :
-false,
-
-"View details" :
+"View or report this error" :
 false,
 
 "Run this job again" :
 false,
 
+"Visualize" :
+false,
+"Visualize in" :
+false,
+
+"Undelete it" :
+false,
+"Permanently remove it from disk" :
+false,
+"Unhide it" :
+false,
+
+"You may be able to" :
+false,
+"set it manually or retry auto-detection" :
+false,
+
 "Edit dataset tags" :
 false,
-
 "Edit dataset annotation" :
 false,
 
-" Click <a href=\"javascript:void(0);\" class=\"dataset-undelete\">here</a> to undelete it or <a href=\"javascript:void(0);\" class=\"dataset-purge\">here</a> to immediately remove it from disk" :
+
+// ---------------------------------------------------------------------------- misc. MVC
+"Tags" :
 false,
-
-" Click <a href=\"javascript:void(0);\" class=\"dataset-unhide\">here</a> to unhide it" :
+"Annotation" :
 false,
-
-"Download" :
+"Edit annotation" :
 false,
 
-"Visualize" :
-false
-
 
 // ----------------------------------------------------------------------------
 },

This diff is so big that we needed to truncate the remainder.

Repository URL: https://bitbucket.org/galaxy/galaxy-central/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.

    

[galaxy-commits] commit/galaxy-central: carlfeberhard: UI: rework zh and ja locale data

commits-noreply＠bitbucket.org