Skip to content

Commit

Permalink
seperate => separate
Browse files Browse the repository at this point in the history
  • Loading branch information
untitaker committed Mar 30, 2016
1 parent 3790842 commit 33a2f2e
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 9 deletions.
2 changes: 1 addition & 1 deletion doc/source/configspec.rst
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ The [keybindings] section
~~~~~~~~~~~~~~~~~~~~~~~~~

keybindings for :command:`ikhal` are set here. You can bind more than one key
(combination) to a command by supplying a comma-seperated list of keys.
(combination) to a command by supplying a comma-separated list of keys.
For binding key combinations just add concatenate them (with a space in
between), e.g. **ctrl n**.

Expand Down
12 changes: 6 additions & 6 deletions khal/configwizard.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,20 +52,20 @@ def choose_datetime_format():
('day month year', ['%d', '%m', '%Y']),
('month day year', ['%m', '%d', '%Y']),
]
seperator_choices = ['-', '.', '/']
separator_choices = ['-', '.', '/']
validate = partial(validate_int, min_value=0, max_value=2)

print("What ordering of year, month, date do you want to use? "
"(You can choose the seperator in the next step)")
"(You can choose the separator in the next step)")
print('\n'.join(
['[{}] {}'.format(num, one) for num, (one, _) in enumerate(ordering_choices)]))
ordering_no = prompt("Please choose one of the above options", value_proc=validate)
print()
print("Now, please choose a seperator")
print('\n'.join(['[{}] {}'.format(num, one) for num, one in enumerate(seperator_choices)]))
print("Now, please choose a separator")
print('\n'.join(['[{}] {}'.format(num, one) for num, one in enumerate(separator_choices)]))
prompt_text = "Please choose one of the above options"
seperator = seperator_choices[prompt(prompt_text, value_proc=validate)]
dateformat = seperator.join(ordering_choices[ordering_no][1])
separator = separator_choices[prompt(prompt_text, value_proc=validate)]
dateformat = separator.join(ordering_choices[ordering_no][1])
today = date.today()
text = ("Does this look sensible to you: {} "
"(today as an example: {})?".format(dateformat, today.strftime(dateformat)))
Expand Down
2 changes: 1 addition & 1 deletion khal/settings/khal.spec
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ longdatetimeformat = string(default='%d.%m.%Y %H:%M')
weeknumbers = weeknumbers(default='off')

# keybindings for :command:`ikhal` are set here. You can bind more than one key
# (combination) to a command by supplying a comma-seperated list of keys.
# (combination) to a command by supplying a comma-separated list of keys.
# For binding key combinations just add concatenate them (with a space in
# between), e.g. **ctrl n**.
[keybindings]
Expand Down
5 changes: 4 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,11 @@ setenv =

[testenv:py-style]
skip_install=True
whitelist_externals = sh
deps = flake8
commands = flake8
commands =
flake8
sh -c '! grep -ri seperat */*'

[flake8]
max-line-length = 100
Expand Down

0 comments on commit 33a2f2e

Please sign in to comment.