Add translation

+ some little fix

Author: sapk

models/gpg_key.go

@@ -313,15 +313,14 @@ func populateHash(hashFunc crypto.Hash, msg []byte) (hash.Hash, error) {
 	return h, nil
 }
 
-// readArmoredSign reads an armored signture block with the given type. https://sourcegraph.com/github.com/golang/crypto/-/blob/openpgp/read.go#L24:6-24:17
+// readArmoredSign read an armored signature block with the given type. https://sourcegraph.com/github.com/golang/crypto/-/blob/openpgp/read.go#L24:6-24:17
 func readArmoredSign(r io.Reader) (body io.Reader, err error) {
-	expectedType := "PGP SIGNATURE"
 	block, err := armor.Decode(r)
 	if err != nil {
 		return
 	}
-	if block.Type != expectedType {
-		return nil, fmt.Errorf("expected '" + expectedType + "', got: " + block.Type)
+	if block.Type != openpgp.SignatureType {
+		return nil, fmt.Errorf("expected '" + openpgp.SignatureType + "', got: " + block.Type)
 	}
 	return block.Body, nil
 }
@@ -378,7 +377,7 @@ func ParseCommitWithSignature(c *git.Commit) *CommitVerification {
 			log.Error(3, "SignatureRead err: %v", err)
 			return &CommitVerification{
 				Verified: false,
-				Reason:   "Failed to extract signature",
+				Reason:   "gpg.error.extract_sign",
 			}
 		}
 		//Generating hash of commit
@@ -387,7 +386,7 @@ func ParseCommitWithSignature(c *git.Commit) *CommitVerification {
 			log.Error(3, "PopulateHash: %v", err)
 			return &CommitVerification{
 				Verified: false,
-				Reason:   "Failed to generate hash of commit",
+				Reason:   "gpg.error.generate_hash",
 			}
 		}
 
@@ -397,7 +396,7 @@ func ParseCommitWithSignature(c *git.Commit) *CommitVerification {
 			log.Error(3, "NoCommitterAccount: %v", err)
 			return &CommitVerification{
 				Verified: false,
-				Reason:   "No account linked to committer email",
+				Reason:   "gpg.error.no_committer_account",
 			}
 		}
 
@@ -406,7 +405,7 @@ func ParseCommitWithSignature(c *git.Commit) *CommitVerification {
 			log.Error(3, "ListGPGKeys: %v", err)
 			return &CommitVerification{
 				Verified: false,
-				Reason:   "Failed to retrieve publics keys of committer",
+				Reason:   "gpg.error.failed_retrieval_gpg_keys",
 			}
 		}
 
@@ -434,13 +433,13 @@ func ParseCommitWithSignature(c *git.Commit) *CommitVerification {
 		}
 		return &CommitVerification{ //Default at this stage
 			Verified: false,
-			Reason:   "No known key found for this signature in database",
+			Reason:   "gpg.error.no_gpg_keys_found",
 		}
 	}
 
 	return &CommitVerification{
-		Verified: false,                 //Default value
-		Reason:   "Not a signed commit", //Default value
+		Verified: false,                         //Default value
+		Reason:   "gpg.error.not_signed_commit", //Default value
 	}
 }
 

options/locale/locale_en-US.ini

@@ -1347,3 +1347,12 @@ no_read = You do not have any read notifications.
 pin = Pin notification
 mark_as_read = Mark as read
 mark_as_unread = Mark as unread
+
+
+[gpg]
+error.extract_sign = Failed to extract signature
+error.generate_hash = Failed to generate hash of commit
+error.no_committer_account = No account linked to committer email
+error.no_gpg_keys_found = "Failed to retrieve publics keys of committer"
+error.no_gpg_keys_found = "No known key found for this signature in database"
+error.not_signed_commit = "Not a signed commit"

templates/repo/commits_table.tmpl

@@ -46,7 +46,11 @@
 								{{ShortSha .ID.String}}
 								{{if .Signature}}
 									<div class="ui detail icon button">
-										<i title="{{.Verification.Reason}}" class="{{if .Verification.Verified }}lock green{{else}}unlock{{end}} icon"></i>
+										{{if .Verification.Verified}}
+											<i title="{{.Verification.Reason}}" class="lock green icon"></i>
+										{{else}}
+											<i title="{{$.i18n.Tr .Verification.Reason}}" class="unlock icon"></i>
+										{{end}}
 									</div>
 								{{end}}
 							</a>

templates/repo/diff/page.tmpl

@@ -45,16 +45,14 @@
 				{{if .Verification.Verified }}
 					<div class="ui bottom attached positive message" style="text-align: initial;color: black;">
 					  <i class="green lock icon"></i>
-						<span>
-							<span style="color: #2C662D;">Signed by :</span>
-			  			<a href="{{.Verification.SigningUser.HomeLink}}"><strong>{{.Commit.Committer.Name}}</strong></a> <{{.Commit.Committer.Email}}>
-						</span>
+						<span style="color: #2C662D;">Signed by :</span>
+						<a href="{{.Verification.SigningUser.HomeLink}}"><strong>{{.Commit.Committer.Name}}</strong></a> <{{.Commit.Committer.Email}}>
 						<span class="pull-right"><span style="color: #2C662D;">GPG key ID:</span> {{.Verification.SigningKey.KeyID}}</span>
 					</div>
 				{{else}}
 					<div class="ui bottom attached message" style="text-align: initial;color: black;">
 					  <i class="grey unlock icon"></i>
-					  {{.Verification.Reason}}
+					  {{.i18n.Tr .Verification.Reason}}
 					</div>
 				{{end}}
 			{{end}}