Skip to content

Commit

Permalink
Add Japanese lorem words to locale (#900)
Browse files Browse the repository at this point in the history
* Added Japanese words to lorem ja locale

* Use punctuation specific to locale

* Added punctuation to en.yml. Remove fallbacks.

* Addressed Rubocop violation

* Partial Revert "Added punctuation to en.yml. Remove fallbacks."

This reverts `en.yml` from commit 02131b4.

* Add punctuation defaults to lorem
  • Loading branch information
vietqhoang authored and vbrazo committed May 21, 2018
1 parent f5f2755 commit 2d7fcf5
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 3 deletions.
18 changes: 15 additions & 3 deletions lib/faker/lorem.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,23 +29,23 @@ def characters(char_count = 255)
end

def sentence(word_count = 4, supplemental = false, random_words_to_add = 6)
words(word_count + rand(random_words_to_add.to_i), supplemental).join(' ').capitalize + '.'
words(word_count + rand(random_words_to_add.to_i), supplemental).join(' ').capitalize + locale_period
end

def sentences(sentence_count = 3, supplemental = false)
1.upto(resolve(sentence_count)).collect { sentence(3, supplemental) }
end

def paragraph(sentence_count = 3, supplemental = false, random_sentences_to_add = 3)
sentences(resolve(sentence_count) + rand(random_sentences_to_add.to_i), supplemental).join(' ')
sentences(resolve(sentence_count) + rand(random_sentences_to_add.to_i), supplemental).join(locale_space)
end

def paragraphs(paragraph_count = 3, supplemental = false)
1.upto(resolve(paragraph_count)).collect { paragraph(3, supplemental) }
end

def question(word_count = 4, supplemental = false, random_words_to_add = 6)
words(word_count + rand(random_words_to_add.to_i), supplemental).join(' ').capitalize + '?'
words(word_count + rand(random_words_to_add.to_i), supplemental).join(locale_space).capitalize + locale_question_mark
end

def questions(question_count = 3, supplemental = false)
Expand All @@ -54,6 +54,18 @@ def questions(question_count = 3, supplemental = false)

private

def locale_period
translate('faker.lorem.punctuation.period') || '.'
end

def locale_space
translate('faker.lorem.punctuation.space') || ' '
end

def locale_question_mark
translate('faker.lorem.punctuation.question_mark') || '?'
end

# If an array or range is passed, a random value will be selected.
# All other values are simply returned.
def resolve(value)
Expand Down
Loading

0 comments on commit 2d7fcf5

Please sign in to comment.