language_cards 0.3.2 → 2.0.0

data/cards/en/urdu.yml

@@ -0,0 +1,374 @@
+---
+# Urdu: Alphabet (39), Numbers (23), Numerals (10), Common Words (248), Phrases (41)
+Urdu:
+  Alphabet:
+    mapping: { Urdu script: [Latin, Letter name] }
+    ا: [a, aa, alif]
+    ب: [b, be]
+    پ: [p, pe]
+    ت: [t, te]
+    ٹ: [t, tt, te, retroflex te]
+    ث: [s, se]
+    ج: [j, jim, jeem]
+    چ: [ch, che]
+    ح: [h, bari he, he]
+    خ: [kh, khe]
+    د: [d, dal]
+    ڈ: [d, dd, dal, retroflex dal]
+    ذ: [z, zal]
+    ر: [r, re]
+    ڑ: [r, rr, re, retroflex re]
+    ز: [z, ze]
+    ژ: [zh, zhe]
+    س: [s, sin, seen]
+    ش: [sh, shin, sheen]
+    ص: [s, suad, swad]
+    ض: [z, zuad, zwad]
+    ط: [t, toe]
+    ظ: [z, zoe]
+    ع: [ain, ayn]
+    غ: [gh, ghain]
+    ف: [f, fe]
+    ق: [q, qaf, qaaf]
+    ک: [k, kaf, kaaf]
+    گ: [g, gaf, gaaf]
+    ل: [l, lam, laam]
+    م: [m, mim, meem]
+    ن: ['n', nun, noon]
+    ں: ['n', nun ghunna, noon ghunna]
+    و: [w, v, wao, vao]
+    ہ: [h, choti he, chhoti he]
+    ھ: [h, do chashmi he, do-chashmi he]
+    ء: [hamza, hamzah]
+    ی: ['y', i, choti ye, ye]
+    ے: [e, ay, bari ye, badi ye]
+  Numbers:
+    mapping: { Urdu: [Latin, English] }
+    صفر: [sifar, zero, '0']
+    ایک: [ek, aik, one, '1']
+    دو: [do, two, '2']
+    تین: [teen, tin, three, '3']
+    چار: [chaar, char, four, '4']
+    پانچ: [paanch, panch, five, '5']
+    چھ: [chhe, chay, six, '6']
+    سات: [saat, sat, seven, '7']
+    آٹھ: [aath, ath, eight, '8']
+    نو: [nau, nine, '9']
+    دس: [das, ten, '10']
+    گیارہ: [gyaarah, gyarah, eleven, '11']
+    بارہ: [baarah, barah, twelve, '12']
+    بیس: [bees, bis, twenty, '20']
+    تیس: [tees, tis, thirty, '30']
+    چالیس: [chaalees, chalis, forty, '40']
+    پچاس: [pachaas, pachas, fifty, '50']
+    ساٹھ: [saath, sath, sixty, '60']
+    ستر: [sattar, seventy, '70']
+    اسی: [assi, eighty, '80']
+    نوے: [nawway, nabbe, ninety, '90']
+    سو: [sau, hundred, one hundred, '100']
+    ہزار: [hazaar, hazar, thousand, one thousand, '1000']
+  Numerals:
+    mapping: { Urdu digits: [Digit, English] }
+    '۰': ['0', zero]
+    '۱': ['1', one]
+    '۲': ['2', two]
+    '۳': ['3', three]
+    '۴': ['4', four]
+    '۵': ['5', five]
+    '۶': ['6', six]
+    '۷': ['7', seven]
+    '۸': ['8', eight]
+    '۹': ['9', nine]
+  Common Words:
+    mapping: { Urdu: [Latin, English] }
+    میں: [main, mein, I, in]
+    تم: [tum, you]
+    آپ: [aap, you]
+    وہ: [woh, he, she, that]
+    ہم: [hum, we]
+    یہ: [yeh, this, he, she]
+    باپ: [baap, father]
+    ماں: [maan, mother]
+    بھائی: [bhaai, bhai, brother]
+    بہن: [behen, bahan, sister]
+    بیٹا: [beta, son]
+    بیٹی: [beti, daughter]
+    شوہر: [shohar, husband]
+    بیوی: [biwi, wife]
+    دادا: [daada, dada, grandfather]
+    دادی: [daadi, dadi, grandmother]
+    خاندان: [khaandaan, khandan, family]
+    بچہ: [bachcha, bacha, child, kid]
+    لڑکا: [larka, boy]
+    لڑکی: [larki, girl]
+    آدمی: [aadmi, man, person]
+    عورت: [aurat, woman]
+    دوست: [dost, friend]
+    لوگ: [log, people]
+    استاد: [ustaad, ustad, teacher]
+    طالب علم: [taalib-e-ilm, talib ilm, student]
+    ڈاکٹر: [daaktar, doctor]
+    سر: [sar, head]
+    آنکھ: [aankh, eye]
+    کان: [kaan, ear]
+    ناک: [naak, nose]
+    منہ: [munh, mouth, face]
+    ہاتھ: [haath, hand]
+    پاؤں: [paaon, paon, foot]
+    بال: [baal, hair]
+    دل: [dil, heart]
+    چہرہ: [chehra, face]
+    دانت: [daant, tooth]
+    پیٹ: [pet, stomach, belly]
+    پانی: [paani, pani, water]
+    کھانا: [khaana, khana, food, eat, meal]
+    روٹی: [roti, bread, flatbread]
+    چاول: [chaawal, chawal, rice]
+    گوشت: [gosht, meat]
+    مرغی: [murghi, chicken, hen]
+    مچھلی: [machhli, fish]
+    دودھ: [doodh, milk]
+    کافی: [kaafi, coffee, enough, quite]
+    چائے: [chaae, chai, tea]
+    انڈا: [anda, egg]
+    پھل: [phal, fruit]
+    سیب: [seb, apple]
+    کیلا: [kela, banana]
+    سبزی: [sabzi, vegetable, vegetables]
+    نمک: [namak, salt]
+    چینی: [cheeni, sugar, Chinese]
+    کتا: [kutta, dog]
+    بلی: [billi, cat]
+    گھوڑا: [ghora, horse]
+    پرندہ: [parinda, bird]
+    گائے: [gaae, gaay, cow]
+    جانور: [jaanwar, janwar, animal]
+    لال: [laal, lal, red]
+    نیلا: [neela, blue]
+    ہرا: [hara, green]
+    پیلا: [peela, yellow]
+    سفید: [safed, white]
+    کالا: [kaala, kala, black]
+    بھورا: [bhoora, brown]
+    رنگ: [rang, color, colour]
+    دن: [din, day]
+    رات: [raat, night]
+    صبح: [subah, morning]
+    شام: [shaam, evening]
+    آج: [aaj, today]
+    کل: [kal, tomorrow, yesterday]
+    اب: [ab, now]
+    گھنٹہ: [ghanta, hour]
+    منٹ: [minat, minute]
+    ہفتہ: [hafta, week, Saturday]
+    مہینہ: [maheena, mahina, month]
+    سال: [saal, year]
+    وقت: [waqt, time]
+    اتوار: [itwaar, itwar, Sunday]
+    پیر: [peer, Monday]
+    منگل: [mangal, Tuesday]
+    بدھ: [budh, Wednesday]
+    جمعرات: [jumeraat, jumerat, Thursday]
+    جمعہ: [juma, jumma, Friday]
+    گھر: [ghar, house, home]
+    اسکول: [iskool, school]
+    ہسپتال: [haspataal, hospital]
+    بازار: [baazaar, bazaar, market]
+    ہوٹل: [hotal, hotel, restaurant]
+    شہر: [shehar, shahar, city]
+    سڑک: [sarak, road, street]
+    مسجد: [masjid, mosque]
+    دفتر: [daftar, office]
+    بینک: [baink, bank]
+    کمرہ: [kamra, room]
+    غسل خانہ: [ghusl khaana, ghusalkhana, bathroom]
+    ملک: [mulk, country]
+    سمندر: [samandar, sea, ocean]
+    جگہ: [jagah, place, space]
+    دروازہ: [darwaaza, darwaza, door]
+    کھڑکی: [khirki, window]
+    میز: [mez, table]
+    کرسی: [kursi, chair]
+    بستر: [bistar, bed]
+    کتاب: [kitaab, kitab, book]
+    قلم: [qalam, pen]
+    فون: [fon, phone]
+    گاڑی: [gaari, car, vehicle, train]
+    چابی: [chaabi, key]
+    کپڑے: [kapre, clothes]
+    پیسے: [paise, money]
+    پینا: [peena, drink]
+    جانا: [jaana, go]
+    آنا: [aana, come]
+    لکھنا: [likhna, write]
+    پڑھنا: [parhna, read, study]
+    بولنا: [bolna, speak, say]
+    کہنا: [kehna, say, tell]
+    دیکھنا: [dekhna, see, look, watch]
+    سننا: [sunna, hear, listen]
+    جاننا: [jaanna, know]
+    سمجھنا: [samajhna, understand]
+    پسند کرنا: [pasand karna, like]
+    چاہنا: [chaahna, want, love]
+    کام کرنا: [kaam karna, work]
+    سونا: [sona, sleep, gold]
+    بیٹھنا: [baithna, sit]
+    چلنا: [chalna, walk, move]
+    دوڑنا: [daurna, run]
+    کھولنا: [kholna, open]
+    بند کرنا: [band karna, close, shut, turn off]
+    دینا: [dena, give]
+    لینا: [lena, take]
+    خریدنا: [khareedna, buy]
+    بیچنا: [bechna, sell]
+    رہنا: [rehna, live, stay]
+    سیکھنا: [seekhna, learn]
+    مدد کرنا: [madad karna, help]
+    کھیلنا: [khelna, play]
+    پوچھنا: [poochhna, puchna, ask]
+    انتظار کرنا: [intezaar karna, wait]
+    ڈھونڈنا: [dhoondna, search, look for]
+    ملنا: [milna, meet, get]
+    سکنا: [sakna, can, be able]
+    ہونا: [hona, be, happen]
+    کرنا: [karna, do, make]
+    واپس آنا: [waapas aana, come back, return]
+    سفر کرنا: [safar karna, travel]
+    سوچنا: [sochna, think]
+    بھولنا: [bhoolna, forget]
+    یاد کرنا: [yaad karna, remember, memorize, miss]
+    شروع کرنا: [shuru karna, start, begin]
+    ختم کرنا: [khatam karna, finish, end]
+    لانا: [laana, bring]
+    ہنسنا: [hansna, laugh]
+    رونا: [rona, cry]
+    گانا: [gaana, sing, song]
+    پہننا: [pehenna, wear, put on]
+    رکھنا: [rakhna, put, keep, place]
+    بڑا: [bara, big, large, elder]
+    چھوٹا: [chhota, chota, small, little, younger]
+    نیا: [naya, new]
+    پرانا: [puraana, purana, old]
+    اچھا: [achchha, acha, good, okay, nice]
+    برا: [bura, bad]
+    خوبصورت: [khoobsoorat, khubsurat, beautiful]
+    لمبا: [lamba, long, tall]
+    گرم: [garam, hot, warm]
+    ٹھنڈا: [thanda, cold, cool]
+    آسان: [aasaan, asan, easy]
+    مشکل: [mushkil, difficult, hard]
+    تیز: [tez, fast, quick, sharp]
+    آہستہ: [aahista, ahista, slow, slowly]
+    زیادہ: [zyaada, zyada, more, a lot, too much]
+    کم: [kam, less, few, little]
+    خوش: [khush, happy, glad]
+    اداس: [udaas, udas, sad]
+    بھوکا: [bhooka, bhuka, hungry]
+    پیاسا: [pyaasa, pyasa, thirsty]
+    بیمار: [beemaar, bimar, sick, ill]
+    صاف: [saaf, clean, clear]
+    گندا: [ganda, dirty]
+    قریب: [qareeb, near, close]
+    دور: [door, far]
+    کھلا: [khula, open]
+    بند: [band, closed, shut]
+    سستا: [sasta, cheap]
+    مہنگا: [mehenga, mehnga, expensive]
+    صحیح: [sahih, sahi, correct, right]
+    ضروری: [zaroori, necessary, important]
+    بوڑھا: [boorha, old, elderly]
+    جوان: [jawaan, jawan, young]
+    سب: [sab, all, everyone, everything]
+    کیا: [kya, what]
+    کون: [kaun, who]
+    کہاں: [kahaan, kahan, where]
+    کب: [kab, when]
+    کیوں: [kyun, kyon, why]
+    کیسے: [kaise, how]
+    کتنا: [kitna, how much, how many]
+    کون سا: [kaun sa, which]
+    ہاں: [haan, han, 'yes']
+    جی: [jee, ji, 'yes', sir]
+    نہیں: [nahin, nahi, 'no', not]
+    اور: [aur, and, more]
+    یا: [ya, or]
+    لیکن: [lekin, but]
+    پر: [par, 'on', at, but]
+    سے: [se, from, with, than]
+    ساتھ: [saath, with, together]
+    یہاں: [yahaan, yahan, here]
+    وہاں: [wahaan, wahan, there]
+    بہت: [bohat, bahut, very, a lot, much]
+    بھی: [bhi, also, too, even]
+    سورج: [sooraj, suraj, sun]
+    چاند: [chaand, chand, moon]
+    زمین: [zameen, earth, ground, land]
+    بارش: [baarish, barish, rain]
+    درخت: [darakht, tree]
+    پھول: [phool, flower]
+    آگ: [aag, fire]
+    ہوا: [hawa, air, wind]
+    پہاڑ: [pahaar, mountain]
+    راستہ: [raasta, rasta, way, path, road]
+    نام: [naam, name]
+    زبان: [zabaan, zaban, language, tongue]
+    لفظ: [lafz, word]
+    سوال: [sawaal, sawal, question]
+    جواب: [jawaab, jawab, answer, reply]
+    اردو: urdu
+    انگریزی: [angrezi, English]
+    چیز: [cheez, thing]
+    زندگی: [zindagi, life]
+    محبت: [mohabbat, love]
+    بس: [bas, bus, enough]
+    ہوائی جہاز: [hawaai jahaaz, hawai jahaz, airplane, plane]
+    قیمت: [qeemat, keemat, price]
+    موسم: [mausam, weather, season]
+    اوپر: [oopar, upar, up, above]
+    نیچے: [neeche, niche, down, below, under]
+    پہلے: [pehle, before, first, earlier]
+    بعد: [baad, after, later]
+    کام: [kaam, work, job]
+  Phrases:
+    mapping: { Urdu: [Latin, English] }
+    السلام علیکم: [assalam-o-alaikum, assalamu alaikum, hello, peace be upon you]
+    وعلیکم السلام: [walaikum assalam, wa alaikum assalam, and peace be upon you, hello]
+    آداب: [aadaab, adab, greetings, hello]
+    صبح بخیر: [subah bakhair, good morning]
+    شب بخیر: [shab bakhair, good night]
+    خدا حافظ: [khuda hafiz, goodbye, bye]
+    اللہ حافظ: [allah hafiz, goodbye, bye]
+    شکریہ: [shukriya, thank you, thanks]
+    بہت شکریہ: [bohat shukriya, bahut shukriya, thank you very much, thanks a lot]
+    کوئی بات نہیں: [koi baat nahin, no problem, it's okay, you're welcome]
+    براہ مہربانی: [baraae meherbani, barae meharbani, please]
+    معاف کیجیے: [maaf kijiye, excuse me, sorry, pardon me]
+    مجھے افسوس ہے: [mujhe afsos hai, I'm sorry, I am sorry]
+    جی ہاں: [jee haan, ji haan, 'yes']
+    جی نہیں: [jee nahin, ji nahin, 'no']
+    آپ کیسے ہیں: [aap kaise hain, how are you]
+    کیا حال ہے: [kya haal hai, kya hal hai, how are you, how's it going]
+    میں ٹھیک ہوں: [main theek hoon, main thik hun, I'm fine, I'm okay]
+    آپ کا نام کیا ہے: [aap ka naam kya hai, what is your name, what's your name]
+    میرا نام علی ہے: [mera naam ali hai, my name is Ali]
+    آپ سے مل کر خوشی ہوئی: [aap se mil kar khushi hui, nice to meet you, pleased to meet you]
+    مجھے سمجھ نہیں آیا: [mujhe samajh nahin aaya, I don't understand, I didn't understand]
+    مجھے نہیں معلوم: [mujhe nahin maloom, mujhe nahi malum, I don't know]
+    کیا آپ انگریزی بولتے ہیں: [kya aap angrezi bolte hain, do you speak English]
+    میں تھوڑی اردو بولتا ہوں: [main thori urdu bolta hoon, I speak a little Urdu]
+    آہستہ بولیں: [aahista bolein, ahista bolen, speak slowly, please speak slowly]
+    باتھ روم کہاں ہے: [baathroom kahaan hai, bathroom kahan hai, where is the bathroom, where is the toilet]
+    اسٹیشن کہاں ہے: [station kahaan hai, station kahan hai, where is the station]
+    یہ کتنے کا ہے: [yeh kitne ka hai, how much is this, how much is it]
+    آپ کہاں سے ہیں: [aap kahaan se hain, aap kahan se hain, where are you from]
+    میں امریکہ سے ہوں: [main amreeka se hoon, main amrika se hun, I'm from America, I am from America]
+    مجھے پانی چاہیے: [mujhe paani chahiye, mujhe pani chahiye, I want water, I need water]
+    مدد کریں: [madad karein, madad karen, help, please help]
+    کیا وقت ہوا ہے: [kya waqt hua hai, what time is it]
+    خوش آمدید: [khush aamdeed, khush amdid, welcome]
+    ٹھیک ہے: [theek hai, thik hai, okay, alright, fine]
+    سب ٹھیک ہے: [sab theek hai, sab thik hai, everything is fine, all good]
+    ان شاء اللہ: [inshallah, in sha allah, God willing, hopefully]
+    مبارک ہو: [mubarak ho, congratulations]
+    میں آپ سے محبت کرتا ہوں: [main aap se mohabbat karta hoon, I love you]
+    پھر ملیں گے: [phir milenge, phir milen ge, see you again, see you later]

data/language_cards.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Daniel P. Clark']
   spec.email         = ['6ftdan@gmail.com']
 
-  spec.summary       = %q{Flashcard game for language learning.}
-  spec.description   = %q{Flashcard game for language learning. Make your own cards or translations as well.}
+  spec.summary       = %q{Terminal flashcard game for learning languages with foreign scripts.}
+  spec.description   = %q{Flashcard game for language learning: Japanese (kana, JLPT N5-N1 kanji and vocabulary), Chinese (HSK 1-4), Korean, Russian, Arabic, Hindi and many more. Make your own cards or translations as well.}
   spec.homepage      = 'http://github.com/danielpclark/language_cards'
   spec.license       = 'MIT'
 
@@ -21,10 +21,11 @@ Gem::Specification.new do |spec|
   spec.executables   = ['language_cards']
   spec.require_paths = ['lib','cards']
 
-  spec.add_dependency 'highline', '~> 1.7'
-  spec.add_dependency 'i18n', '~> 0.7'
+  spec.required_ruby_version = '>= 2.5'
+
+  spec.add_dependency 'highline', '>= 2.0', '< 4'
+  spec.add_dependency 'i18n', '>= 1.0', '< 2'
   spec.add_dependency 'slop', '~> 4.6'
-  spec.add_development_dependency 'bundler', '~> 1.13'
-  spec.add_development_dependency 'rake', '~> 12.3'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'minitest', '~> 5.10'
 end

data/lib/language_cards/card_set_builder.rb

@@ -0,0 +1,11 @@
+require 'language_cards/models/card'
+
+module LanguageCards
+  module CardSetBuilder
+    def card_set_builder(translation_cards = {})
+      translation_cards.each_with_object([]) do |(key, value), memo|
+        memo << Card.new(key, value)
+      end
+    end
+  end
+end

data/lib/language_cards/controllers/application_controller.rb

@@ -1,3 +1,5 @@
+require 'erb'
+
 module LanguageCards
   module Controllers
     class ApplicationController

data/lib/language_cards/controllers/game.rb

@@ -8,13 +8,13 @@ module LanguageCards
       def render(correct:, incorrect:, title:, timer:, last:)
         _score = t('Game.ScoreMenu.Score') + ": %0.2d%%" % calc_score(correct, incorrect)
         _timer = [((t('Timer.Timer') + ": " + timer.ha) if timer.time?), nil, timer.h]
-        _mexit = t 'Menu.Exit'
+        _mexit = t 'Game.Exit'
 
         super(binding)
       end
 
-      def process(cards, mode)
-        ic = struct_data.new(cards, mode)
+      def process(cards)
+        ic = struct_data.new(cards)
         ic.get_input
         {
           correct: ic.valid?,
@@ -23,7 +23,7 @@ module LanguageCards
       end
 
       def struct_data
-        Struct.new(:card_set, :mode) do
+        Struct.new(:game) do
           def input
             @input 
           end
@@ -33,13 +33,17 @@ module LanguageCards
           end
 
           def card
-            @card ||= card_set.sample.current
+            @card ||= game.sample.current
           end
 
           def display
             "#{card}"
           end
 
+          def mode
+            game.mode
+          end
+
           def expected
             case mode
             when :translate
@@ -62,7 +66,7 @@ module LanguageCards
           end
 
           def valid?
-            card_set.match? input
+            game.match? input
           end
         end
       end

data/lib/language_cards/controllers/main_menu.rb

@@ -3,19 +3,36 @@ require 'language_cards/controllers/application_controller'
 module LanguageCards
   module Controllers
     class MainMenu < ApplicationController
-      def render(courses:, mode:)
+      # @param courses [Array<String>] labels for the entries on the current page
+      # @param offset [Integer] number of entries on the pages before this one
+      # @param pages [Paginator, nil] used to show page navigation when needed
+      def render(courses:, mode:, offset: 0, heading: nil, pages: nil, back: false)
         _title = t 'Menu.Title'
-        _select = t 'Menu.Choose'
+        _select = heading || t('Menu.Choose')
         _mode = t('Menu.GameMode') + case mode.peek
                 when :translate then t 'Menu.ModeTranslate'
                 when :typing_practice then t 'Menu.ModeTyping'
                 end
         _toggle = "m: " + t('Menu.ToggleGameMode')
-        _courses = courses.each.with_index.map {|item,index| "#{index + 1}: #{item}" }
+        width = (offset + courses.length).to_s.length
+        _courses = courses.each.with_index(offset + 1).map {|item, number| "#{number.to_s.rjust(width)}: #{item}" }
+        _page = page_line(pages)
+        _back = ("b: " + t('Menu.Back') if back)
+        _quit = "q: " + t('Menu.Quit')
         _mexit = t 'Menu.Exit'
 
         super(binding)
       end
+
+      private
+      def page_line(pages)
+        return unless pages && pages.paginated?
+
+        nav = []
+        nav << "p: " + t('Menu.PreviousPage') if pages.previous_page?
+        nav << "n: " + t('Menu.NextPage') if pages.next_page?
+        [t('Menu.Page', page: pages.page + 1, pages: pages.pages), nav.join('  ')]
+      end
     end
   end
 end

data/lib/language_cards/defaults.rb

@@ -0,0 +1,33 @@
+require 'highline'
+require 'slop'
+require 'i18n'
+
+module LanguageCards
+  # Card files and terminal input are UTF-8 even when the locale isn't set.
+  Encoding.default_external = Encoding::UTF_8 unless Encoding.default_external == Encoding::UTF_8
+
+  OPTS = Slop.parse(suppress_errors: true) do |args|
+    args.banner = 'usage: language_cards [options]'
+    args.string '-l', '--language', 'language (default: en)', default: 'en'
+    args.bool '-v', '--version', 'print the version'
+    args.bool '-h', '--help', 'print this help'
+  end
+
+  CARD_LANGUAGE = OPTS[:language]
+
+  module ESC
+    CLEAR = (ERASE_SCOLLBACK = "\e[3J") + (CURSOR_HOME = "\e[H") + (ERASE_DISPLAY = "\e[2J")
+  end
+
+  CLI = HighLine.new
+  JOIN = " - "
+
+  SUBMENUWIDTH = 60
+
+  # Menu entries shown per page before paginating.
+  PER_PAGE = 10
+
+  ::I18n.config.available_locales = :en
+  ::I18n.load_path = Dir[File.join(File.expand_path(File.join('..','..'), __dir__), 'locales', '*.yml')]
+  ::I18n.load_path += Dir[File.join(File.expand_path(ENV['HOME']), '.language_cards', 'locales', '*.yml')] if ENV['HOME']
+end

data/lib/language_cards/helpers/view_helper.rb

@@ -5,14 +5,15 @@ module LanguageCards
         '~' * SUBMENUWIDTH
       end
 
-      def t str
-        I18n.t str
+      def t str, **options
+        I18n.t str, **options
       end
 
       def draw left=nil, center=nil, right=nil
         width = SUBMENUWIDTH
         str = left.to_s
         str = str + center.to_s.rjust(width/2 - str.length + center.to_s.length/2)
+        str = str.rstrip + ' ' if str.length + right.to_s.length > width && !str.strip.empty?
         str + right.to_s.rjust(width - str.length)
       end
 

data/lib/language_cards/menu_builder.rb

@@ -0,0 +1,11 @@
+require 'language_cards/menu_node'
+
+module LanguageCards
+  def self.menu_builder(cards_yaml)
+    cards_yaml.each_with_object([]) do |(language, values), memo|
+      values.each do |category_with_card_set|
+        memo << MenuNode.new(language, category_with_card_set)
+      end
+    end
+  end
+end

data/lib/language_cards/menu_node.rb

@@ -12,13 +12,18 @@ module LanguageCards
       end
     end
 
-    def title(fmt = ' - ', rng = 0..-1)
+    def title(fmt = JOIN, rng = 0..-1)
       label[rng].delete_if(&:empty?).join(fmt)
     end
 
     # @return <Mode<CardSet> < Game>
-    def mode(game_mode)
-      child.mode(game_mode)
+    def game(mode)
+      child.game(mode)
+    end
+
+    # @return Integer number of cards in the card set
+    def size
+      child.size
     end
 
     # This is the preferred method for the view as this object shouldn't
@@ -29,7 +34,7 @@ module LanguageCards
     end
 
     def to_s
-      label.delete_if(&:empty?).join(' - ')
+      label.delete_if(&:empty?).join(JOIN)
     end
 
     private

data/lib/language_cards/models/card.rb

@@ -0,0 +1,18 @@
+
+module LanguageCards
+  class Card
+    attr_reader :translation
+    def initialize card, translation
+      @card = card.to_s
+      @translation = Array(translation).map(&:to_s)
+    end
+
+    def display
+      @card
+    end
+
+    def to_s
+      @card
+    end
+  end
+end

data/lib/language_cards/models/card_set.rb

@@ -1,28 +1,24 @@
-require 'language_cards/models/grapheme'
-require 'language_cards/grapheme_builder'
+require 'language_cards/models/card'
+require 'language_cards/card_set_builder'
 require 'language_cards/modes/typing_practice'
 require 'language_cards/modes/translate'
 
 module LanguageCards
   class CardSet
-    attr_reader :graphemes
-    def initialize(grapheme_hash)
-      @graphemes = GraphemeBuilder.(grapheme_hash)
+    include CardSetBuilder
+    attr_reader :cards
+    def initialize(card_hash)
+      @cards = card_set_builder(card_hash)
     end
 
-    def sample
-      @graphemes.sample
+    def game(mode)
+      Modes.public_send mode, self
+    rescue NoMethodError
+      raise InvalidGameMode, "Invalid Game Mode!"
     end
 
-    def mode(mode)
-      case mode
-      when :translate
-        Modes::Translate.new(self)
-      when :typing_practice
-        Modes::TypingPractice.new(self) 
-      else
-        raise "Invalid Game Mode!"
-      end
+    def size
+      cards.length
     end
 
     # So as to not interfere with menu naming as this is not meant to
@@ -34,5 +30,8 @@ module LanguageCards
     def label
       []
     end
+
+    private
+    class InvalidGameMode < StandardError; end
   end
 end