There should be no whitespace before comments or other specifiers (#12)

* There should be no whitespace before comments or other specifiers * Convert tab to space * Specify eol
taylor-s-dean · Jan 11, 2022 · d552ecf · d552ecf
1 parent 660fb03
commit d552ecf
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/gettext_test.go b/gettext_test.go
@@ -31,6 +31,9 @@ var messagesJSON = []byte(`
                 "other"
             ]
         },
+        "#This is a message with a # sign.": {
+           "translation": "#This is a translation with a # sign."
+        },
         "One piggy went to the market.": {
             "translation": "Одна свинья ушла на рынок."
         }

diff --git a/po2json/po2json.go b/po2json/po2json.go
@@ -41,14 +41,14 @@ var (
 		stateMsgstrPlural: "msgstr_plural",
 	}
 
-	regexComment        = regexp.MustCompile(`\s*#.*`)
+	regexComment        = regexp.MustCompile(`^#.*$`)
 	regexEmpty          = regexp.MustCompile(`^\s*$`)
-	regexMsgctxt        = regexp.MustCompile(`msgctxt\s+(".*")`)
-	regexMsgid          = regexp.MustCompile(`msgid\s+(".*")`)
-	regexMsgstr         = regexp.MustCompile(`msgstr\s+(".*")`)
-	regexMsgidPlural    = regexp.MustCompile(`msgid_plural\s+(".*")`)
-	regexMsgstrPlural   = regexp.MustCompile(`msgstr\[\d+\]\s+(".*")`)
-	regexString         = regexp.MustCompile(`(".*")`)
+	regexMsgctxt        = regexp.MustCompile(`^msgctxt\s+(".*")$`)
+	regexMsgid          = regexp.MustCompile(`^msgid\s+(".*")$`)
+	regexMsgstr         = regexp.MustCompile(`^msgstr\s+(".*")$`)
+	regexMsgidPlural    = regexp.MustCompile(`^msgid_plural\s+(".*")$`)
+	regexMsgstrPlural   = regexp.MustCompile(`^msgstr\[\d+\]\s+(".*")$`)
+	regexString         = regexp.MustCompile(`^(".*")$`)
 	regexHeaderKeyValue = regexp.MustCompile(`([a-zA-Z0-9-]+)\s*:\s*(.*?)(?:\n|\z)`)
 )
 

diff --git a/testdata/test.po b/testdata/test.po
@@ -35,6 +35,9 @@ msgctxt "Context with plural"
 msgid "One piggy went to the market."
 msgstr "Одна свинья ушла на рынок."
 
+msgid "#This is a message with a # sign."
+msgstr "#This is a translation with a # sign."
+
 #, fuzzy
 msgctxt ""
 "Context with plural"