small word tweaks

master
endorphant 2016-05-03 13:46:54 -04:00
parent 681d1ba34f
commit 7f150238a9
1 changed files with 11 additions and 11 deletions

View File

@ -83,7 +83,7 @@ def check_init():
except ValueError: except ValueError:
setup_handler() setup_handler()
raw_input("\n\npress <enter> to explore your feelings.\n\n") raw_input("\n\npress <enter> to explore your feels.\n\n")
core.load() core.load()
return "" return ""
else: else:
@ -209,10 +209,10 @@ def main_menu():
#print(BANNER) #print(BANNER)
#redraw() #redraw()
menuOptions = [ menuOptions = [
"record feelings", "record your feels",
"check out neighbors", "check out your neighbors",
"change settings", "change your settings",
"send feedback", "send some feedback",
"(wip) see credits"] "(wip) see credits"]
#print(SPACER) #print(SPACER)
print("you're at ttbp home. remember, you can always press <ctrl-c> to come back here.\n\n") print("you're at ttbp home. remember, you can always press <ctrl-c> to come back here.\n\n")
@ -235,7 +235,7 @@ def main_menu():
for townie in os.listdir("/home"): for townie in os.listdir("/home"):
if os.path.exists(os.path.join("/home", townie, ".ttbp", "config", "ttbprc")): if os.path.exists(os.path.join("/home", townie, ".ttbp", "config", "ttbprc")):
users.append(townie) users.append(townie)
redraw("the following "+p.no("user", len(users))+" are publishing on ttbp:\n\n") redraw("the following "+p.no("user", len(users))+" "+p.plural("is", len(users))+" recording feels on ttbp:\n\n")
view_neighbors(users) view_neighbors(users)
elif choice == '2': elif choice == '2':
pretty_settings = "\n\ttext editor:\t" +SETTINGS["editor"] pretty_settings = "\n\ttext editor:\t" +SETTINGS["editor"]
@ -251,7 +251,7 @@ def main_menu():
elif choice == '4': elif choice == '4':
redraw(DUST) redraw(DUST)
elif choice == 'secret': elif choice == 'secret':
redraw("here are your recorded feelings, listed by date:\n\n") redraw("here are your recorded feels, listed by date:\n\n")
view_entries() view_entries()
elif choice == "none": elif choice == "none":
return stop() return stop()
@ -281,11 +281,11 @@ def feedback_menu():
def write_entry(entry=os.path.join(DATA, "test.txt")): def write_entry(entry=os.path.join(DATA, "test.txt")):
raw_input("\nfeelings will be recorded for today, "+time.strftime("%d %B %Y")+".\n\nif you've already started recording feelings for this day, you \ncan pick up where you left off.\n\npress <enter> to begin recording your feelings.\n\n") raw_input("\nfeels will be recorded for today, "+time.strftime("%d %B %Y")+".\n\nif you've already started recording feels for this day, you \ncan pick up where you left off.\n\npress <enter> to begin recording your feels.\n\n")
subprocess.call([SETTINGS["editor"], entry]) subprocess.call([SETTINGS["editor"], entry])
core.load_files() core.load_files()
core.write("index.html") core.write("index.html")
redraw("posted to "+LIVE+USER+"/"+SETTINGS["publish dir"]+"/index.html\n\nthanks for sharing your feelings!") redraw("posted to "+LIVE+USER+"/"+SETTINGS["publish dir"]+"/index.html\n\nthanks for sharing your feels!")
return return
def send_feedback(subject="none", mailbox=os.path.join(FEEDBACK, USER+"-"+time.strftime("%Y%m%d-%H%M")+".msg")): def send_feedback(subject="none", mailbox=os.path.join(FEEDBACK, USER+"-"+time.strftime("%Y%m%d-%H%M")+".msg")):
@ -315,12 +315,12 @@ def view_neighbors(users):
if os.path.splitext(filename)[1] == ".txt" and len(os.path.splitext(filename)[0]) == 8: if os.path.splitext(filename)[1] == ".txt" and len(os.path.splitext(filename)[0]) == 8:
count += 1 count += 1
pad = "" pad = ""
if len(user) < 4: if len(user) < 8:
pad = "\t" pad = "\t"
user = "~"+user user = "~"+user
if len(user) < 8: if len(user) < 8:
user += "\t" user += "\t"
print("\t"+user+"\t at "+url+pad+"\t("+p.no("entry", count)+")") print("\t"+user+"\t"+url+pad+"\t("+p.no("feel", count)+")")
raw_input("\n\npress <enter> to go back home.\n\n") raw_input("\n\npress <enter> to go back home.\n\n")
redraw() redraw()