From 325a93f3c31d7094a3a1ad6363d7bb2d0a1b59d3 Mon Sep 17 00:00:00 2001 From: Jermolene Date: Tue, 17 Jun 2014 07:56:13 +0100 Subject: [PATCH] Move button language to $:/language/Buttons --- core/language/en-GB/Buttons.multids | 22 ++++++++++++++++++++++ core/language/en-GB/Toolbars.multids | 20 -------------------- core/ui/EditToolbar/cancel.tid | 2 +- core/ui/EditToolbar/delete.tid | 2 +- core/ui/EditToolbar/save.tid | 2 +- core/ui/PageControls/controlpanel.tid | 2 +- core/ui/PageControls/newtiddler.tid | 2 +- core/ui/PageControls/savewiki.tid | 2 +- core/ui/ViewToolbar/close.tid | 2 +- core/ui/ViewToolbar/edit.tid | 2 +- core/ui/ViewToolbar/info.tid | 2 +- 11 files changed, 31 insertions(+), 29 deletions(-) create mode 100644 core/language/en-GB/Buttons.multids delete mode 100644 core/language/en-GB/Toolbars.multids diff --git a/core/language/en-GB/Buttons.multids b/core/language/en-GB/Buttons.multids new file mode 100644 index 000000000..39adfe081 --- /dev/null +++ b/core/language/en-GB/Buttons.multids @@ -0,0 +1,22 @@ +title: $:/language/Buttons/ + +AdvancedSearch/Caption: advanced search +AdvancedSearch/Hint: Advanced search +Cancel/Caption: cancel +Cancel/Hint: Cancel editing this tiddler +Close/Caption: close +Close/Hint: Close this tiddler +ControlPanel/Caption: control panel +ControlPanel/Hint: Open control panel +Delete/Caption: delete +Delete/Hint: Delete this tiddler +Edit/Caption: edit +Edit/Hint: Edit this tiddler +Info/Caption: info +Info/Hint: Show information for this tiddler +NewTiddler/Caption: new tiddler +NewTiddler/Hint: Create a new tiddler +Save/Caption: save +Save/Hint: Save this tiddler +SaveWiki/Caption: save changes +SaveWiki/Hint: Save changes diff --git a/core/language/en-GB/Toolbars.multids b/core/language/en-GB/Toolbars.multids deleted file mode 100644 index 710c8e1e4..000000000 --- a/core/language/en-GB/Toolbars.multids +++ /dev/null @@ -1,20 +0,0 @@ -title: $:/language/ - -EditToolbar/Delete/Caption: delete -EditToolbar/Delete/Hint: Delete this tiddler -EditToolbar/Cancel/Caption: cancel -EditToolbar/Cancel/Hint: Cancel editing this tiddler -EditToolbar/Save/Caption: save -EditToolbar/Save/Hint: Save this tiddler -ViewToolbar/Info/Caption: info -ViewToolbar/Info/Hint: Show information for this tiddler -ViewToolbar/Edit/Caption: edit -ViewToolbar/Edit/Hint: Edit this tiddler -ViewToolbar/Close/Caption: close -ViewToolbar/Close/Hint: Close this tiddler -PageControls/NewTiddler/Caption: new tiddler -PageControls/NewTiddler/Hint: Create a new tiddler -PageControls/ControlPanel/Caption: control panel -PageControls/ControlPanel/Hint: Open control panel -PageControls/SaveWiki/Caption: save changes -PageControls/SaveWiki/Hint: Save changes diff --git a/core/ui/EditToolbar/cancel.tid b/core/ui/EditToolbar/cancel.tid index e3aee1bdf..b271f158e 100644 --- a/core/ui/EditToolbar/cancel.tid +++ b/core/ui/EditToolbar/cancel.tid @@ -1,4 +1,4 @@ title: $:/core/ui/EditToolbar/cancel tags: $:/tags/EditToolbar -<$button message="tw-cancel-tiddler" title={{$:/language/EditToolbar/Cancel/Hint}} aria-label={{$:/language/EditToolbar/Cancel/Caption}} class="btn-invisible">{{$:/core/images/cancel-button}} \ No newline at end of file +<$button message="tw-cancel-tiddler" title={{$:/language/Buttons/Cancel/Hint}} aria-label={{$:/language/Buttons/Cancel/Caption}} class="btn-invisible">{{$:/core/images/cancel-button}} \ No newline at end of file diff --git a/core/ui/EditToolbar/delete.tid b/core/ui/EditToolbar/delete.tid index 0f3a82ee8..a8f5881d4 100644 --- a/core/ui/EditToolbar/delete.tid +++ b/core/ui/EditToolbar/delete.tid @@ -1,4 +1,4 @@ title: $:/core/ui/EditToolbar/delete tags: $:/tags/EditToolbar -<$button message="tw-delete-tiddler" title={{$:/language/EditToolbar/Delete/Hint}} aria-label={{$:/language/EditToolbar/Delete/Caption}} class="btn-invisible">{{$:/core/images/delete-button}} \ No newline at end of file +<$button message="tw-delete-tiddler" title={{$:/language/Buttons/Delete/Hint}} aria-label={{$:/language/Buttons/Delete/Caption}} class="btn-invisible">{{$:/core/images/delete-button}} \ No newline at end of file diff --git a/core/ui/EditToolbar/save.tid b/core/ui/EditToolbar/save.tid index 53e73e1b2..fcd40d461 100644 --- a/core/ui/EditToolbar/save.tid +++ b/core/ui/EditToolbar/save.tid @@ -1,4 +1,4 @@ title: $:/core/ui/EditToolbar/save tags: $:/tags/EditToolbar -<$button message="tw-save-tiddler" title={{$:/language/EditToolbar/Save/Hint}} aria-label={{$:/language/EditToolbar/Save/Caption}} class="btn-invisible">{{$:/core/images/done-button}} \ No newline at end of file +<$button message="tw-save-tiddler" title={{$:/language/Buttons/Save/Hint}} aria-label={{$:/language/Buttons/Save/Caption}} class="btn-invisible">{{$:/core/images/done-button}} \ No newline at end of file diff --git a/core/ui/PageControls/controlpanel.tid b/core/ui/PageControls/controlpanel.tid index dbf480390..b0ca856e4 100644 --- a/core/ui/PageControls/controlpanel.tid +++ b/core/ui/PageControls/controlpanel.tid @@ -1,4 +1,4 @@ title: $:/core/ui/PageControls/control-panel tags: $:/tags/PageControls -<$button to="$:/ControlPanel" title={{$:/language/PageControls/ControlPanel/Hint}} aria-label={{$:/language/PageControls/ControlPanel/Caption}} class="btn-invisible">{{$:/core/images/options-button}} \ No newline at end of file +<$button to="$:/ControlPanel" title={{$:/language/Buttons/ControlPanel/Hint}} aria-label={{$:/language/Buttons/ControlPanel/Caption}} class="btn-invisible">{{$:/core/images/options-button}} \ No newline at end of file diff --git a/core/ui/PageControls/newtiddler.tid b/core/ui/PageControls/newtiddler.tid index a8bd49153..576bdc7ad 100644 --- a/core/ui/PageControls/newtiddler.tid +++ b/core/ui/PageControls/newtiddler.tid @@ -1,4 +1,4 @@ title: $:/core/ui/PageControls/new-tiddler tags: $:/tags/PageControls -<$button message="tw-new-tiddler" title={{$:/language/PageControls/NewTiddler/Hint}} aria-label={{$:/language/PageControls/NewTiddler/Caption}} class="btn-invisible">{{$:/core/images/new-button}} \ No newline at end of file +<$button message="tw-new-tiddler" title={{$:/language/Buttons/NewTiddler/Hint}} aria-label={{$:/language/Buttons/NewTiddler/Caption}} class="btn-invisible">{{$:/core/images/new-button}} \ No newline at end of file diff --git a/core/ui/PageControls/savewiki.tid b/core/ui/PageControls/savewiki.tid index e5aac6bd2..5e1285c54 100644 --- a/core/ui/PageControls/savewiki.tid +++ b/core/ui/PageControls/savewiki.tid @@ -1,4 +1,4 @@ title: $:/core/ui/PageControls/save-wiki tags: $:/tags/PageControls -<$button message="tw-save-wiki" title={{$:/language/PageControls/SaveWiki/Hint}} aria-label={{$:/language/PageControls/SaveWiki/Caption}} class="btn-invisible">{{$:/core/images/save-button}} \ No newline at end of file +<$button message="tw-save-wiki" title={{$:/language/Buttons/SaveWiki/Hint}} aria-label={{$:/language/Buttons/SaveWiki/Caption}} class="btn-invisible">{{$:/core/images/save-button}} \ No newline at end of file diff --git a/core/ui/ViewToolbar/close.tid b/core/ui/ViewToolbar/close.tid index 28633ff87..92a9c163f 100644 --- a/core/ui/ViewToolbar/close.tid +++ b/core/ui/ViewToolbar/close.tid @@ -1,4 +1,4 @@ title: $:/core/ui/ViewToolbar/close tags: $:/tags/ViewToolbar -<$button message="tw-close-tiddler" title={{$:/language/ViewToolbar/Close/Hint}} aria-label={{$:/language/ViewToolbar/Close/Caption}} class="btn-invisible">{{$:/core/images/close-button}} \ No newline at end of file +<$button message="tw-close-tiddler" title={{$:/language/Buttons/Close/Hint}} aria-label={{$:/language/Buttons/Close/Caption}} class="btn-invisible">{{$:/core/images/close-button}} \ No newline at end of file diff --git a/core/ui/ViewToolbar/edit.tid b/core/ui/ViewToolbar/edit.tid index 9b910af46..ac398358a 100644 --- a/core/ui/ViewToolbar/edit.tid +++ b/core/ui/ViewToolbar/edit.tid @@ -1,4 +1,4 @@ title: $:/core/ui/ViewToolbar/edit tags: $:/tags/ViewToolbar -<$button message="tw-edit-tiddler" title={{$:/language/ViewToolbar/Edit/Hint}} aria-label={{$:/language/ViewToolbar/Edit/Caption}} class="btn-invisible">{{$:/core/images/edit-button}} \ No newline at end of file +<$button message="tw-edit-tiddler" title={{$:/language/Buttons/Edit/Hint}} aria-label={{$:/language/Buttons/Edit/Caption}} class="btn-invisible">{{$:/core/images/edit-button}} \ No newline at end of file diff --git a/core/ui/ViewToolbar/info.tid b/core/ui/ViewToolbar/info.tid index dc348c31e..2fc1c8ab8 100644 --- a/core/ui/ViewToolbar/info.tid +++ b/core/ui/ViewToolbar/info.tid @@ -1,4 +1,4 @@ title: $:/core/ui/ViewToolbar/info tags: $:/tags/ViewToolbar -<$button popup=<> title={{$:/language/ViewToolbar/Info/Hint}} aria-label={{$:/language/ViewToolbar/Info/Caption}} class="btn-invisible" selectedClass="tw-selected">{{$:/core/images/info-button}} \ No newline at end of file +<$button popup=<> title={{$:/language/Buttons/Info/Hint}} aria-label={{$:/language/Buttons/Info/Caption}} class="btn-invisible" selectedClass="tw-selected">{{$:/core/images/info-button}} \ No newline at end of file