From e56ecab1575f1b25552988b9efff2836f05f87f9 Mon Sep 17 00:00:00 2001 From: Bjørn Erik Pedersen Date: Mon, 8 Aug 2016 00:12:06 +0200 Subject: Multilingual TODO-fixes, take 1 See #2309 --- helpers/content.go | 18 ------------------ helpers/content_test.go | 10 ---------- helpers/url.go | 1 - 3 files changed, 29 deletions(-) (limited to 'helpers') diff --git a/helpers/content.go b/helpers/content.go index 427d960a1..49d3469c5 100644 --- a/helpers/content.go +++ b/helpers/content.go @@ -396,24 +396,6 @@ func WordCount(s string) map[string]int { return m } -// RemoveSummaryDivider removes summary-divider from content. -// TODO(bep) ml remove -func RemoveSummaryDivider(content []byte) []byte { - b := bytes.Replace(content, summaryDividerAndNewLines, []byte(""), 1) - if len(b) != len(content) { - return b - } - return bytes.Replace(content, SummaryDivider, []byte(""), 1) -} - -func removeInternalSummaryDivider(content []byte) []byte { - b := bytes.Replace(content, summaryDividerAndNewLines, []byte(""), 1) - if len(b) != len(content) { - return b - } - return bytes.Replace(content, SummaryDivider, []byte(""), 1) -} - // TruncateWordsByRune truncates words by runes. func TruncateWordsByRune(words []string, max int) (string, bool) { count := 0 diff --git a/helpers/content_test.go b/helpers/content_test.go index 85e0d7f4f..3a038ea12 100644 --- a/helpers/content_test.go +++ b/helpers/content_test.go @@ -409,13 +409,3 @@ func TestWordCount(t *testing.T) { t.Errorf("Actual Map (%v) does not equal expected (%v)", actualMap, expectedMap) } } - -func TestRemoveSummaryDivider(t *testing.T) { - content := []byte("This is before. This is after.") - actualRemovedContent := RemoveSummaryDivider(content) - expectedRemovedContent := []byte("This is before. This is after.") - - if !bytes.Equal(actualRemovedContent, expectedRemovedContent) { - t.Errorf("Actual removed content (%s) did not equal expected removed content (%s)", actualRemovedContent, expectedRemovedContent) - } -} diff --git a/helpers/url.go b/helpers/url.go index f9a41dde3..83273324d 100644 --- a/helpers/url.go +++ b/helpers/url.go @@ -186,7 +186,6 @@ func getLanguagePrefix() string { } // IsAbsURL determines whether the given path points to an absolute URL. -// TODO(bep) ml tests func IsAbsURL(path string) bool { url, err := url.Parse(path) if err != nil { -- cgit v1.2.3