Commit 11962647 authored by Dave Griffiths's avatar Dave Griffiths

final changes and hindi translation

parent 7546de51
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="foam.symbai"
android:versionCode="14"
android:versionCode="16"
android:versionName="1.0">
<application android:label="@string/app_name"
android:icon="@drawable/logo"
......
......@@ -189,7 +189,8 @@
(previous (ktv-get-whole (get-current 'entity-values '()) (ktv-key ktv))))
(cond
((and previous (ktv-eq? previous ktv))
(msg "eusv: no change for" (ktv-key ktv)))
;(msg "eusv: no change for" (ktv-key ktv))
0)
(unique-id
(update-entity db table (entity-id-from-unique db table unique-id) (list ktv)))
(else
......
......@@ -66,11 +66,13 @@
((zero? n) '())
(else (cons (car l) (crop (cdr l) (- n 1))))))
(define (in-list? n l)
(cond
((null? l) #f)
((equal? n (car l)) #t)
(else (in-list? n (cdr l)))))
;(define (in-list? n l)
; (cond
; ((null? l) #f)
; ((equal? n (car l)) #t)
; (else (in-list? n (cdr l)))))
(define in-list? string-in-list-fast) ;; optimisation
(define (find n l)
(cond
......
This diff is collapsed.
This diff is collapsed.
......@@ -112,7 +112,7 @@
(cdr l)))
"))\n" )))
""
(csv->list (file->string "translations.csv"))))
(csv->list (file->string "translations3.csv"))))
;(csv->list csv)
......@@ -137,6 +137,9 @@
(define i18n-text
(list
))
......
......@@ -80,6 +80,12 @@
(get-entity db table i))
(filter-entities db table type filter)))
(define (db-filter-inc-deleted db table type filter)
(map
(lambda (i)
(get-entity db table i))
(filter-entities-inc-deleted db table type filter)))
;; only return (eg. name and photo)
(define (db-filter-only db table type filter kt-list)
(map
......
......@@ -23,8 +23,8 @@ num-male-children, "Male children"
num-female-children, "Female children"
mother-name, "Mother name"
father-name, "Father name"
mother-alive, "Alive"
father-alive, "Alive"
mother-alive, "Alive?"
father-alive, "Alive?"
spouse-name, "Spouse name"
spouse-gender, "Spouse gender"
village-notes, "Notes"
......@@ -172,13 +172,14 @@ gender, "Gender", "U/ka"
education, "Education", "Jingpule"
illiterate, "Illiterate", "Bym Nang/Bymstad"
literate, "Literate", "Lah Nang/Lahtip"
no-education, "No education"
primary, "Primary 1-5", "Biang 1-5"
middle, "Middle 6-8", "Ba Pdeng 6-8"
high, "High 9-10", "Lah Khamstad 9-10"
secondary, "Higher Secondary", "Lah stad"
university, "University", "La pyndep university"
spouse, "Spouse", ""
change-id, "Change", ""
change-id, "Change photo", ""
head-of-house, "Head of house", ""
marital-status, "Current marital status", ""
currently-married, "Currently married", ""
......@@ -229,8 +230,8 @@ crop-unit, "Crop unit", ""
crop-used, "Eaten or fed to livestock", ""
crop-sold, "Sold", ""
crop-seed, "Seed", ""
mother, "Mother", ""
father, "Father", ""
bio-mother, "Biological mother", ""
bio-father, "Biological father", ""
change-mother, "Change mother", ""
change-father, "Change father", ""
alive, "Alive", ""
......@@ -246,9 +247,9 @@ social-four, "Four", ""
social-five, "Five", ""
social-nickname, "Name"
social-gender, "Gender"
social-relationship, "Relation", ""
social-relationship, "Relation to you", ""
social-residence, "Residence", ""
social-strength, "Strength", ""
social-strength, "In the last year how often have you talked to them?", ""
friendship-one, "One", ""
friendship-two, "Two", ""
friendship-three, "Three", ""
......@@ -260,23 +261,28 @@ sister, "Sister", ""
brother, "Brother", ""
spouse, "Spouse", ""
children, "Children", ""
eldest-uncle, "Eldest uncle"
co-wife, "Co-wife", ""
spouse-mother, "Spouse's mother", ""
spouse-father, "Spouse's father", ""
spouse-brother, "Spouse's brother", ""
spouse-sister, "Spouse's sister", ""
spouse-brother-wife, "Spouse's brother's wife", ""
spouse-sister-husband, "Spouse's sister's husband", ""
friend, "Friend", ""
neighbour, "Neighbour", ""
religious-leader, "Religious leader", ""
village-leader, "Village leader", ""
same, "Same", ""
daily, "Daily", ""
weekly, "Weekly", ""
monthly, "Monthly", ""
less, "Less", ""
child-name, "Name"
daily, "Every day", ""
weekly, "About once a week", ""
monthly, "About once a month", ""
less, "Less than one a month", ""
child-name, "Child's name"
child-gender, "Gender"
child-age, "Age"
child-home, "Lives at home"
child-alive, "Alive"
child-home, "Lives at home?"
child-alive, "Alive?"
default-child-name, "child"
move-button, "Move household"
move-household, "Pick a new household"
......@@ -292,9 +298,9 @@ occupation-labour, "Daily wage labour"
occupation-cows, "Cows"
occupation-fishing, "Fishing"
occupation-other, "Other"
friendship-question, "LIST UP TO FIVE PERSONS whom you have really liked to talk to in the last year. They can be of either sex. They can be friend neighbours relatives co-wives; they can live in this village or elsewhere; anyone you like to talk to.", ""
prestige-question, "LIST UP TO FIVE PERSONS who you think are the most respected in the village:"
knowledge-question, "LIST UP TO FIVE PERSONS who you think are the most knowledgeable in the village:"
friendship-question, "LIST UP TO FIVE PERSONS with whom you really like to talk and whom you have spoken to in the last year. They can be men or women. They can be your friends or relatives. They can be your spouse. They can be people living in this village or in another village. Anyone whom you like to talk to."
prestige-question, "LIST UP TO FIVE PERSONS who you think are the most respected, whom you respect from the heart: They can be men or women. They can be your friends or relatives. They can be your spouse. They can be people living in this village or in another village."
knowledge-question, "LIST UP TO FIVE PERSONS who you think are the most knowledgeable: They can be men or women. They can be your friends or relatives. They can be your spouse. They can be people living in this village or in another village."
local-dialect, "Local dialects spoken"
market-frequency, "Frequency of tribal market (per week)"
crop-prices, "Price of crops grown per unit"
......@@ -309,6 +315,17 @@ residences, "Names of different places lived since birth"
income-notes, "Income notes"
crop-produced, "Quantity produced"
crop-given, "Given to others"
social-answered, "Answer supplied?"
friendship-answered, "Answer supplied?"
social-answered, "Agreed to answer?"
friendship-answered, "Agreed to answer?"
chooser-no-selection, "Clear"
hybrid, "Hybrid"
local, "Local"
dont-know, "Dont know"
do-move, "Move me!"
move-are-you-sure, "Are you sure you want to move me?"
same-village, "Same village"
other-village, "Other village"
mother-residence, "Mother's current village"
father-residence, "Father's current village"
spouse-residence, "Spouse's current village"
child-birth-year, "Child birth year"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment