mirror of
				https://github.com/gohugoio/hugo.git
				synced 2024-05-11 05:54:58 +00:00 
			
		
		
		
	hugolib: Correct usage of "shortcode" in error messages
This commit is contained in:
		
				
					committed by
					
						 Bjørn Erik Pedersen
						Bjørn Erik Pedersen
					
				
			
			
				
	
			
			
			
						parent
						
							1b46d2cfee
						
					
				
				
					commit
					01ee525f47
				
			| @@ -446,7 +446,7 @@ func handleShortcodes(p *Page, t tpl.Template, rawContentCopy []byte) ([]byte, e | ||||
| 		rawContentCopy, err = replaceShortcodeTokens(rawContentCopy, shortcodePlaceholderPrefix, shortcodes) | ||||
|  | ||||
| 		if err != nil { | ||||
| 			jww.FATAL.Printf("Failed to replace short code tokens in %s:\n%s", p.BaseFileName(), err.Error()) | ||||
| 			jww.FATAL.Printf("Failed to replace shortcode tokens in %s:\n%s", p.BaseFileName(), err.Error()) | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
|   | ||||
| @@ -167,7 +167,7 @@ func HandleShortcodes(stringToParse string, page *Page, t tpl.Template) (string, | ||||
| 		tmpContentWithTokensReplaced, err := replaceShortcodeTokens([]byte(tmpContent), shortcodePlaceholderPrefix, shortcodes) | ||||
|  | ||||
| 		if err != nil { | ||||
| 			return "", fmt.Errorf("Fail to replace short code tokens in %s:\n%s", page.BaseFileName(), err.Error()) | ||||
| 			return "", fmt.Errorf("Failed to replace shortcode tokens in %s:\n%s", page.BaseFileName(), err.Error()) | ||||
| 		} | ||||
| 		return string(tmpContentWithTokensReplaced), nil | ||||
| 	} | ||||
|   | ||||
| @@ -441,7 +441,7 @@ func TestExtractShortcodes(t *testing.T) { | ||||
| 		if this.expectShortCodes != "" { | ||||
| 			shortCodesAsStr := fmt.Sprintf("map%q", collectAndSortShortcodes(shortCodes)) | ||||
| 			if !strings.Contains(shortCodesAsStr, this.expectShortCodes) { | ||||
| 				t.Fatalf("[%d] %s: Short codes not as expected, got %s but expected %s", i, this.name, shortCodesAsStr, this.expectShortCodes) | ||||
| 				t.Fatalf("[%d] %s: Shortcodes not as expected, got %s but expected %s", i, this.name, shortCodesAsStr, this.expectShortCodes) | ||||
| 			} | ||||
| 		} | ||||
| 	} | ||||
|   | ||||
		Reference in New Issue
	
	Block a user