Merge branch 'Lergin-bug/#203_#204' into release/1.2.0

SpongePowered · Jan 28, 2017 · 95cf067 · 95cf067
2 parents 9189ec0 + 81ce671
commit 95cf067
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/app/views/utils/editor.scala.html b/app/views/utils/editor.scala.html
@@ -13,29 +13,29 @@
 
 @if(enabled) {
     <!-- Edit -->
-    <button type="button" class="btn btn-sm btn-edit btn-page btn-default">
+    <button type="button" class="btn btn-sm btn-edit btn-page btn-default" title="@messages("general.edit")">
         <i class="fa fa-edit"></i> @messages("general.edit")
     </button>
 
     <!-- Preview -->
-    <div class="btn-edit-container btn-preview-container">
+    <div class="btn-edit-container btn-preview-container" title="@messages("general.preview")">
         <button type="button" class="btn btn-sm btn-preview btn-page btn-default">
             <i class="fa fa-eye"></i>
         </button>
     </div>
 
     <!-- Save -->
     @if(savable) {
-        <div class="btn-edit-container btn-save-container">
+        <div class="btn-edit-container btn-save-container" title="@messages("general.save")">
             <button form="form-editor-save" type="submit" class="btn btn-sm btn-save btn-page btn-default">
-                <i class="fa icon-save"></i>
+                <i class="fa fa-save"></i>
             </button>
         </div>
     }
 
     <!-- Cancel -->
     @if(cancellable) {
-        <div class="btn-edit-container btn-cancel-container">
+        <div class="btn-edit-container btn-cancel-container" title="@messages("general.cancel")">
             <button type="button" class="btn btn-sm btn-cancel btn-page btn-default">
                 <i class="fa fa-times"></i>
             </button>
@@ -44,7 +44,7 @@
 
     <!-- Delete -->
     @if(deletable) {
-        <div class="btn-edit-container btn-delete-container">
+        <div class="btn-edit-container btn-delete-container" title="@messages("general.delete")">
             <button type="button" class="btn btn-sm btn-page-delete btn-page btn-default"
             data-toggle="modal" data-target="#modal-page-delete">
                 <i class="fa fa-trash"></i>

diff --git a/conf/messages b/conf/messages
@@ -27,6 +27,7 @@ general.irc                     =   Chat
 general.edit                    =   Edit
 general.cancel                  =   Cancel
 general.save                    =   Save
+general.preview                 =   Preview
 general.delete                  =   Delete
 general.name                    =   Name
 general.close                   =   Close
@@ -141,7 +142,7 @@ project.create.selectFile       =   Select plugin file
 project.create.destination      =   Project will be created at {0}
 project.create.infoText.head    =   A project contains your downloads and the documentation for your plugin.
 project.create.infoText.bottom  =   Begin by uploading your plugin JAR file with a valid <i>mcmod.info</i> file in the first level or a ZIP file with your valid plugin JAR in the first level. Plugins with missing or incomplete metadata files will not be accepted.
-project.create.infoText.pgp     =   To upload files to Ore, you must first add a PGP Public Key to your account and all files must be uploaded with a corresponding signature. <a href="https://docs.spongepowered.org/ore/publish">Learn more</a>
+project.create.infoText.pgp     =   To upload files to Ore, you must first add a PGP Public Key to your account and all files must be uploaded with a corresponding signature. <a href="https://docs.spongepowered.org/master/en/ore/publish.html">Learn more</a>
 project.create.issue-input      =   Issue tracker URL
 project.create.source-input     =   Source code URL
 project.icon                    =   Project icon
@@ -277,4 +278,4 @@ licenses.mit = MIT
 licenses.apache2.0 = Apache 2.0
 licenses.gpl = GNU General Public License (GPL)
 licenses.lgpl = GNU Lesser General Public License (LGPL)
-licenses.custom = Custom
+licenses.custom = Custom