nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:diaspora/diaspora

Browse source
This commit is contained in:
Raphael 2010-09-23 10:24:17 -07:00
commit 95396cd9b2
5 changed files with 196 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
README.md
View file

@ -115,6 +115,14 @@ If you're on **Mac OS X**, you already have Ruby on your system. Yay!
### MongoDB
To install MongoDB on **Fedora**, use the official repositories
sudo yum install mongodb-server
Ensure that the server is started at system reboot:
sudo chkconfig mongod on
To install MongoDB on **Ubuntu**, add the official MongoDB repository
[here](http://www.mongodb.org/display/DOCS/Ubuntu+and+Debian+packages).
@ -147,32 +155,6 @@ Then run:
sudo chmod -Rv 777 /data/
To install MongoDB on a x86_64 **Fedora** system, add the official MongoDB
repository from MongoDB
(http://www.mongodb.org/display/DOCS/CentOS+and+Fedora+Packages) into
/etc/yum.repos.d/10gen.repo:
[10gen]
name=10gen Repository
baseurl=http://downloads.mongodb.org/distros/fedora/13/os/x86_64/
gpgcheck=0
enabled=1
Then use yum to install the packages:
sudo yum install mongo-stable mongo-stable-server
If you're running a 32-bit system, run `wget
http://fastdl.mongodb.org/linux/mongodb-linux-i686-1.6.2.tgz`. If you're
running a 64-bit system, run `wget
http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-1.6.2.tgz`.
# extract
tar xzf mongodb-linux-i686-1.4.0.tgz
# create the required data directory
sudo mkdir -p /data/db
sudo chmod -Rv 777 /data/
To install MongoDB on **Mac OS X**, run the following:
brew install mongo
@ -266,7 +248,7 @@ run `service mongodb start`). If you installed the binary manually, run `sudo
mongod` from where mongo is installed to start mongo.
If you installed the Fedora package, MongoDB will need to be started via
`service mongodb start`. If you installed the binary manually, run `sudo
`service mongod start`. If you installed the binary manually, run `sudo
mongod` from where Mongo is installed to start Mongo.
If you installed the OsX package through "brew", MongoDB will need to be

2
app/views/photos/_new_photo.haml
View file

@ -8,7 +8,7 @@
var uploader = new qq.FileUploader({
element: document.getElementById('file-upload'),
params: {'album_id' : "#{@album.id}"},
allowedExtensions: ['jpg', 'jpeg', 'png'],
allowedExtensions: ['jpg', 'jpeg', 'png', 'gif'],
action: "#{photos_path}"
});
}

2
config/app_config.yml.example
View file

@ -12,7 +12,7 @@ default:
socket_collection_name: 'websocket'
pubsub_server: 'https://pubsubhubbub.appspot.com/'
mongo_host: 'localhost'
mongo_post: 27017
mongo_port: 27017
development:

143
config/locales/cy.yml Normal file
View file

@ -0,0 +1,143 @@
# Copyright (c) 2010, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3. See
# the COPYRIGHT file.
# Sample localization file for English. Add more files in this directory for other locales.
# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
cy:
hello: "Helo byd"
layouts:
application:
edit_profile: "golygu proffil"
logout: "arwyddo allan"
shared:
aspect_nav:
all_aspects: "Pob agwedd"
manage: "Rheoli"
manage_your_aspects: "Rheoli eich agweddau"
sub_header:
all_aspects: "Pob agwedd"
manage_aspects: "Rheloi agweddau"
publisher:
share: "Rhannu"
aspect_friends:
add_friends: "ychwanegu ffrindiau"
albums:
album:
you: "chi"
new_album:
create: "creu"
add_a_new_album: "Ychwanegu albwm newydd"
show:
edit_album: "Golygu Albwm"
albums: "albymau"
updated: "diweddarwyd"
by: "gan"
edit:
editing: "Wrthi'n golygu"
updated: "diweddarwyd"
are_you_sure: "Ydych chi'n sicr?"
delete_album: "Dileu Albwm"
cancel: "Cancel"
index:
home: "adref"
new_album: "Albwm Newydd"
create:
success: "Chi wedi creu albwm a'i enwi'n %{name}."
update:
success: "Mae albwm %{name} wedi'i olygu yn llwyddiannus."
failure: "Wedi methu golygu albwm %{name}."
destroy:
success: "Wedi dileu albwm %{name}."
aspects:
index:
photos: "lluniau"
show:
photos: "lluniau"
manage:
add_a_new_aspect: "Ychwanegwch agwedd"
add_a_new_friend: "Ychwanegwch ffrind newydd"
show: "Dangos"
update_aspects: "Diweddaru Agweddau"
requests: "Ceisiadau"
ignore_remove: "Anwybyddu/Tynnu"
new_aspect:
add_a_new_aspect: "Ychwanegwch agwedd newydd"
create: "Creu"
create:
success:"Cliciwch ar y plus ar y chwith i ddweud wrth Diaspora pwy all weld eich agwedd newydd."
users:
edit:
cancel: "Cancel"
update_profile: "Diweddaru Proffil"
home: "Adref"
diaspora_username: "FFUGENW DIASPORA"
info: "Gwybodaeth"
picture: "Llun"
editing_profile: "Golygu proffil"
albums: "Albymau"
you_dont_have_any_photos: "Does gennych chi ddim lluniau! Ewch i'r"
page_to_upload_some: "dudalen i uwchlwytho rhai."
comments:
comment:
ago: "yn ol"
new_comment:
comment: "Sylw"
photos:
show:
prev: "blaenorol"
full_size: "maint llawn"
next: "neasf"
edit_photo: "Golygu Llun"
delete_photo: "Dileu Llun"
are_you_sure: "Ydych chi'n sicr?"
comments: "sylwadau"
edit:
editing: "Golygu"
are_you_sure: "Ydych chi'n sicr?"
delete_photo: "Dileu Llun"
photo:
show_comments: "dangos sylwadau"
posted_a_new_photo_to: "postiwyd llun newydd i"
new:
new_photo: "Llun Newydd"
back_to_list: "Nol i'r Rhestr"
post_it: "postiwch e!"
registrations:
new:
sign_up: "Cofrestrwch"
status_messages:
new_status_message:
tell_me_something_good: "Dwi eisiau clywed rhwbeth da"
oh_yeah: "oh yeah!"
status_message:
show_comments: "dangos sylwadau"
delete: "Dileu"
are_you_sure: "Ydych chi'n sicr?"
show:
status_message: "Neges Statws"
comments: "sylwadau"
are_you_sure: "Ydych chi'n sicr?"
destroy: "Dinistrio"
view_all: "Gweld Pob Un"
message: "Neges"
owner: "Perchennog"
people:
index:
add_friend: "ychwanegu ffrind"
real_name: "enw llawn"
diaspora_handle: "bachyn diaspora"
thats_you: "dyna chi!"
friend_request_pending: "cais ffrind dan ystyriaeth"
you_have_a_friend_request_from_this_person: "mae'r person yma eisiau bod yn ffrind i chi"
new:
new_person: "Person Newydd"
back_to_list: "Nol i'r Rhestr"
show:
last_seen: "gwelwyd diwethaf: %{how_long_ago}"
friends_since: "yn ffrindiau ers: %{how_long_ago}"
save: "arbed"
are_you_sure: "Ydych chi'n sicr?"
remove_friend: "dileu ffrind"

42
config/locales/devise.cy.yml Normal file
View file

@ -0,0 +1,42 @@
# Copyright (c) 2010, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3. See
# the COPYRIGHT file.
cy:
errors:
messages:
not_found: "ni chanfuwyd"
already_confirmed: "cadarnhawyd eisioes"
not_locked: "heb ei gloi"
devise:
failure:
unauthenticated: 'Mae angen i chi arwyddo i mewn neu ymuno cyn parhau.'
unconfirmed: 'Rhaid i chi gadarnhau eich cyfrif cyn parhau.'
locked: 'Mae eich cyfrif wedi'i gloi.'
invalid: 'E-bost neu gyfrinair annilys.'
invalid_token: 'Tocyn dilysu annilys.'
timeout: 'Mae eich sesiwn wedi dod i ben, arwyddwch i mewn eto i barhau.'
inactive: 'Nid yw eich cyfrif wedi'i actifadu.'
sessions:
signed_in: 'Arwyddwyd i fewn yn llwyddiannus.'
signed_out: 'Arwyddwyd allan yn llwyddiannus.'
passwords:
send_instructions: 'Byddwch yn derbyn e-bost â chyfarwyddiadau ar sut i gadarnhau eich cyfrif mewn ychydig funudau.'
updated: 'Newidiwyd eich cyfrinair yn llwyddiannus. Rydych chi wedi arwyddo i fewn.'
confirmations:
send_instructions: 'Byddwch yn derbyn e-bost â chyfarwyddiadau ar sut i gadarnhau eich cyfrif mewn ychydig funudau.'
confirmed: 'Cadarnhawyd eich cyfrif yn llwyddiannus. Rydych chi wedi arwyddo i fewn.'
registrations:
signed_up: 'Rydych chi wedi arwyddo i fyny yn llwyddiannus. Anfonwyd cadarnhad at eich e-bost os yw wedi'i alluogi.'
updated: 'Diweddarwyd eich cyfrif yn llwyddiannus.'
destroyed: 'Hwyl fawr! Canslwyd eich cyfrif yn llwyddiannus. Rydym yn gobeithio gweld chi eto yn fuan.'
unlocks:
send_instructions: 'Byddwch yn derbyn e-bost gyda cyfarwyddiadau ar sut i agor eich cyfrif mewn ychydig funudau.'
unlocked: 'Datglowyd eich cyfrif yn llwyddiannus. Rydych chi wedi arwyddo i fewn.'
mailer:
confirmation_instructions: 'Cyfarwyddiadau cadarnhad.'
reset_password_instructions: 'Ailosod cyfarwyddiadau cyfrinair'
unlock_instructions: 'Cyfarwyddiadau Datgloi'